diff --git a/Manifest b/Manifest
index 42164dd6b80e..96c693f28b25 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29441 BLAKE2B abdcdc378b10adbd34a5878ee9a57359c3d23fd42429108e4fc69b3ce7103c8e0c8db25b4511f5e5770a0033a794b423a04699451204e248be22deeb8c03d1b8 SHA512 fa11b6f4b51e7aea5b8e396a98ab7ba40a014d205a8ebe7b25bb5e37ae4925e8b5b26638491991a564c324dbd1c8da7868d2fd26fb38bf3cde9fe38d876ff48e
-TIMESTAMP 2023-04-18T11:39:54Z
+MANIFEST Manifest.files.gz 29479 BLAKE2B 279e2ed4a638e70350b795a54f206b07f867d9ee75516a0085c9d77b837525db35b662a3e6ed040adf39d1f6d2d8fd4e8340c723ea23bf0bb12caac1fd0dd330 SHA512 9b953c0999e3776924c586c1c209d3f6d87fb820a094c0955209f61a2dde9629cc39d69afea7291c929dd48ea6a1f14e177d606df0485ac1860ef372f74dbce2
+TIMESTAMP 2023-04-20T18:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ+gYpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBf/JfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBgaA/+KEYNxQ1OoNKWahfmpeXUhLkYHQUlak1N83H1TrYNNnD42bmmBgkIboyz
-YCjXZTmscwc+JYk71E6NxRz2ZL/RdtfwUqUO2o4ggEi8ydVJufvj67hbVF+NvxQD
-UusviheDSGdHiod1J2H82wT5gIkxglaz9dAFS73MfyiPRZFfqAzcaMVAfCB0O/05
-nlsB8laXXl1ATjCuWKPRrkwwnhHJfMEKgsOeQtDCCk74b+0t4Cw/MHRHivg1Fs4K
-uPOTTc2J3uqhfHfcFqR22T/jqWwsS1VXJcIk0equBErfbhA5xfH7rcDmPqj3clBw
-EEtDAjCPYzQfs8z4KeGxVIW1IgLOswJtKfQGHWU92qMIWDAYxm8L4P1FQg+H3qbS
-K6E/JwkBYzdnuUrfct1UBWFFKLqBGydDe4bB7r+OQRvOByQek8J4BeXf0ViO3bli
-9FYMHVBwKiSbZkkbwEClIhlhS9YY2m5fgCluVRJyW/JqTAMdRNBaHSOLNuNU/Zd3
-1fPzO/O8AMuT/HhE3LyFpXT0AreFSuyV31Od87Qklartwnq8IkCaEfnd/PToBq+q
-GaMcGgA2q4JqW63qM8I8SyNqE3wqQ/NcHHqI2ngsPq2fZlIi939XFybVsXV7v+U2
-J8KmFrsqoeadto4iYfzPgZPNo1cu2bRaWjQma46o2iJMElhWR2M=
-=rkv/
+klAJXQ/9Fo4Q2Hy0BuuyE5sohttZ+BI4UP9ZF9ZU9z083DYk4uw0+q2RnFDI3FGY
+5NKUaku9BwCL/A37lhwEcPU8fp2vcUoOp4ofLeTHVWF4T84Ce8Fyq8Qu1VmKVZx/
+LztO0G6mO0lVo8DUEG11l2A+VizTjvii9qMN50/2s6uKATe7bO1wQk8P8TiLc48V
+n+yzLwWqyIV70otdvynkaGoTx+qHZd7RA0JKjwpQPjoSklVP4oA5IKmg3vRptqSN
+/4Ccku2SpJnPs9ts23XXfBfJtGdQCBczqZ/SvjAKh46UZLDTfwWg08kCgPzMPU3r
+Bv5zjXJVAE0oADqFLCIdpNpn+5rmgTvUeyC6i0CBqRmZx6DfMLAdzR68+XRTeaZP
+4uADPSfYXzudTJdmXTg7bvdeVZ1SZ/AeJryn5lTed+Zj+DA+a8CGMvHfyHTMJ50q
+hZJMXQnx7Bwo1g5gJMW24k3TT3V6fWuB2U4L8aZCIQALd+UDBAdenJT4/KIT+UkX
+JFrtAD/JU2LQW0sFkPAjYv9V/vDddbcHLnZz45jSk8v1PDZ0HSOXlkcsvfnJtn8C
+R2uMzSbv+ypJ0aU/svZR1I+z0Sz+ilIYu7X+pUbZhPhRXK0ztRYImH8VyZMSmNHm
+EX/cJsSZtwvbKrkzOuBLKPXCGgnypel8+j3D+QoowMTWe/8Qq5c=
+=pO4i
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 9f0e1fdc4fa3..22a19d079dc6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index bdd0a2b5ad57..3206883e76b5 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 830b8125875b..5f2d44ee93b7 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,8 +1,10 @@
 AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47
 AUX speech-tools-2.5.0-drop-curses.patch 1413 BLAKE2B 4fce1450ce3e3067dbe44d9148e1a73137a0aa77736c7e628181d1e69bc3d4d88a7cc55436bfac6312a3c80390742011f74079387362bd6cc2f43f1016609388 SHA512 9e41db0ac2eb15956723b0ea3b6525a6c5ccc3094f2470afee605deccbeda1dcd8f000e6240f0efb08fafdc573974afbc77c8271eedde2e58ac1a6790dd55345
 AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d52c447b0183cc59146ec892b86d360f16fccab0a85667743c6e0f31a07f20983cce604d3202756c16eae4eff2eb88b1079407c SHA512 ae34fadda5f92dfade923af07222c1ed35b8b39bafc7604a86cebd7196888b2cf9a41fe2686e5210a556309a9c2e71076d22e3f56f1ccec0aca3d4a7bd18f3c1
+AUX speech-tools-2.5.0-musl-isnan.patch 1951 BLAKE2B 01cdd30d53f7a095b7f97678ca3282304161667915e198a6b152752a73559474f2d825dd19ffa25c602719115cdae160919bfc365bfc0f1bfeab019dcfe28876 SHA512 51a4e0b0f9ffc73b6c14471c69cc6fcf1c2ea237d256b46b3936ac9589cbeed7978f900e5a129df4cb89ecc444130775a03dda66979587a8b34b2cabcf845851
 AUX speech-tools-2.5.0-warnings.patch 1467 BLAKE2B ae91bce60190029ba2850c2649e3f7f116357b2c4f77f90a1ba3176ba43daf732d690e1e0e6ad2820db34417f4732d8c177e2fb25325d4994c29061739f2fc95 SHA512 16911fb73f43cdb9db7d426cc68549077bd53798dadd17965607853886284521f5bfa2632b6888e46eca3b3fe2e5bd27523304aa9305e2a410d5477f46e618d8
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
 EBUILD speech-tools-2.5.0-r1.ebuild 4034 BLAKE2B 1a7fcdb442f26b041060f02c49a869dedb6e05fdbfab57d530a79fb05fd26d1197c4079bfba26446dfc2bab2a4729f9999287d3f2d69efc3c195bddac8bb8a9b SHA512 ed252c93cf41931efbed7e1fa82ab847800b76770e6d653ab1524c18cbe50a607822097d98b44d950d2449a4cfec83c35290a145aa088ebf3d9031aa323d8751
+EBUILD speech-tools-2.5.0-r2.ebuild 4076 BLAKE2B df874fc145f7e60f58389fdc493b633b6aaa72619d49661a4c3ba9c9aeb87f81d1e03e3cd2ee3e8b7578dff855d910f8fa06f2c4b82800701071bebeb6ac99af SHA512 04ee8a2b233799021087459172cb18cd3fc387143ca93faeff543bbe81db6e0d9738f1de4109fb0678ee5418a71e7668c4a2254c854c0e8f99a4fca2889066bc
 MISC metadata.xml 483 BLAKE2B b5318b0e97d1e7e19848eeae2b447037e940cda1ca1c7cc4204cbf9d95d52a5fce5430efe94f0d8e3066a974b78d1a8abdc72580b7678ae86e30577e9545f787 SHA512 e7d6f2ccbebfb2ae9bf41577a3b1d902c7d711d5887d9a4233f7c5d42a57915e1874f97676c61d79fb5ececa0e7244f58533c17f098c717712ac274d60c14ee7
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch
new file mode 100644
index 000000000000..da0077313abd
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch
@@ -0,0 +1,65 @@
+See https://bugs.openjdk.org/browse/JDK-8178689 for some analysis - we can
+safely replace the deprecated/obsolete isnanf (which musl doesn't immplement)
+with isnan.
+
+https://bugs.gentoo.org/896170
+https://bugs.gentoo.org/829344
+--- a/intonation/tilt/tilt_utils.cc
++++ b/intonation/tilt/tilt_utils.cc
+@@ -133,7 +133,7 @@ float rfc_to_t_tilt(EST_Features &e)
+ {
+     float t_tilt;
+     t_tilt = (rfc_to_a_tilt(e) + rfc_to_d_tilt(e)) / 2;
+-    if (isnanf(t_tilt))
++    if (isnan(t_tilt))
+ 	t_tilt = 0.0;
+     return t_tilt;
+ }
+--- a/sigpr/pda/smooth_pda.cc
++++ b/sigpr/pda/smooth_pda.cc
+@@ -112,7 +112,7 @@ void smooth_portion(EST_Track &c, EST_Features &op)
+ 
+     for (i = 0; i < c.num_frames(); ++i)
+     {   // occasionally NaNs result...
+-	if (isnanf(a[i]))
++	if (isnan(a[i]))
+ 	{
+ 	    c.set_break(i);
+ 	    c.a(i) = 0.0;
+--- a/sigpr/sigpr_frame.cc
++++ b/sigpr/sigpr_frame.cc
+@@ -314,7 +314,7 @@ void lpc2cep(const EST_FVector &lpc, EST_FVector &cep)
+     for (n = 0; n < cep.length(); n++) 
+     {
+ 	// check if NaN -- happens on some frames of silence
+-	if (isnanf(cep[n]) ) cep[n] = 0.0;
++	if (isnan(cep[n]) ) cep[n] = 0.0;
+ 	
+ 	if (cep[n] >  MAX_ABS_CEPS){
+ 	    cerr << "WARNING : cepstral coeff " << n << " was " << 
+--- a/stats/confusion.cc
++++ b/stats/confusion.cc
+@@ -138,7 +138,7 @@ void print_confusion(const EST_FMatrix &a, EST_StrStr_KVL &list,
+ 	cout.precision(3);
+ 	cout.setf(ios::right);
+ //	cout.setf(ios::fixed, ios::floatfield);
+-	if (isnanf(correct(i)))
++	if (isnan(correct(i)))
+ 	    cout << endl;
+ 	else
+ 	    cout << correct(i) << endl;
+--- a/include/EST_math.h
++++ b/include/EST_math.h
+@@ -81,12 +81,6 @@ extern "C" {
+ #define isnanf(X) isnan(X)
+ #endif
+ 
+-/* Linux (and presumably Hurd too as Linux is GNU libc based) */
+-/* Sorry I haven't confirmed this cpp symbol yet              */
+-#if defined(linux)
+-#define isnanf(X) __isnanf(X)
+-#endif
+-
+ /* OS/2 with gcc EMX */
+ #if defined(__EMX__)
+ #define isnanf(X) isnan(X)
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..649cf3b379e0
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
+SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
+	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
+S="${WORKDIR}/speech_tools"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nas openmp X"
+
+RDEPEND="
+	media-libs/alsa-lib
+	sys-libs/ncurses:=
+	nas? ( media-libs/nas )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md lib/cstrutt.dtd lib/example_data )
+
+PATCHES=(
+	"${WORKDIR}/patch/02_all_gcc42.patch"
+	"${WORKDIR}/patch/03_all_GentooLinux.patch"
+	"${WORKDIR}/patch/05_all_sharedlib.patch"
+	"${WORKDIR}/patch/06_all_gcc43-include.patch"
+	"${WORKDIR}/patch/09_all_remove-shared-refs.patch"
+	"${WORKDIR}/patch/10_all_base_class.patch"
+	"${WORKDIR}/patch/81_all_etcpath.patch"
+	"${WORKDIR}/patch/91_all_gentoo-config.patch"
+	"${WORKDIR}/patch/92_all_ldflags_fix.patch"
+	"${WORKDIR}/patch/94_all_ncurses_tinfo.patch"
+
+	# Fix underlinking, bug #493204
+	"${FILESDIR}/${PN}-2.1-underlinking.patch"
+	"${FILESDIR}/${PN}-2.5.0-fno-common.patch"
+	"${FILESDIR}/${PN}-2.5.0-drop-curses.patch"
+	"${FILESDIR}/${P}-warnings.patch"
+	"${FILESDIR}/${P}-musl-isnan.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^CXXFLAGS  =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \
+		config/compilers/gcc_defaults.mak || die
+
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
+		main/siod_main.cc || die
+
+	# bug #309983
+	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
+		"${S}"/config/systems/sparc_SunOS5.mak || die
+
+	sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \
+		-e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \
+		-e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \
+		config/compilers/gcc_defaults.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+
+	if use nas; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
+			${CONFIG} || die
+	fi
+
+	if ! use X; then
+		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
+	fi
+
+	econf
+}
+
+src_compile() {
+	# Lacks prototypes, bug #881863
+	append-cflags -std=gnu89
+	# Uses 'register' keyword removed in C++17, bug #894184
+	append-cxxflags -std=c++14
+
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CC_OTHER_FLAGS="${CFLAGS}" \
+		CXX_OTHER_FLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+
+	dolib.so lib/libest*.so*
+
+	insinto /usr/share/speech-tools
+	doins -r config base_class
+
+	insinto /usr/share/speech-tools/lib
+	doins -r lib/siod
+
+	mv include speech-tools || die
+	doheader -r speech-tools
+	dosym ../../include/speech-tools /usr/share/speech-tools/include
+
+	for file in bin/*; do
+		[ "${file}" = "bin/Makefile" ] && continue
+		dobin ${file}
+		dstfile="${ED}/usr/${file}"
+		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+
+		# This just changes LD_LIBRARY_PATH
+		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
+	done
+
+	exeinto /usr/$(get_libdir)/speech-tools
+	for file in `find main -perm /111 -type f`; do
+		doexe ${file}
+	done
+
+	# Remove bcat (only useful for testing on windows, see bug #418301).
+	rm "${ED}/usr/bin/bcat" || die
+	rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die
+}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 992d13e7efbf..de865bff7d89 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8a607377b5a3..dc6c6422ac9e 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.27.112.gh.tar.gz 2398322 BLAKE2B aad52e0df4da8c59441b6540f0ce3ac2
 DIST aws-cli-1.27.113.gh.tar.gz 2398657 BLAKE2B 00fc53140bb5085713fecfb4182bb37a032d8cd02de4328435a04e2052ee058ca64ab05666562dd9665c86f95afccb94d1230b248408412a024c973b05ddadcd SHA512 238fd1743b008e76a50edbf688020ecf5d0a302f66d288cdc440893a40471525f9cdd85b8f3fa48370d235de2cafed9b616b335541194e5312e3869c5db746dd
 DIST aws-cli-1.27.114.gh.tar.gz 2406530 BLAKE2B a566214d83d0238c74e306d82829bc9a512aa03def8a4f3ccffc819ded588427051c524fbd91c32f1dd6f6eafd54e6fe40a1e701c9985a1ec587f362fe1c2920 SHA512 60df892a996b5b5c36478e86f321ae9abe3c2d3faafc3187d0b9442d060633ddeddbeeab7ee42a0eca7cb45b07f8c86bbf9d626362a26c503f10b1c693dd1f2a
 DIST aws-cli-1.27.115.gh.tar.gz 2406947 BLAKE2B ef5ac62ef273d92b19d1ef2ea755b35f2353a3aea66e935e44408f11c84320701b7419cfbf36f3ed220d62f3ca3d95ee455b50db4fbed70da7cdef885401090b SHA512 878da56008e5c8cd8347571187713c0624dfedae58bcf02df2082560cdcd082721cd215c4e4bce0b82281bdc61979f4006dd3b860bde65adbf072b45ec89130b
+DIST aws-cli-1.27.116.gh.tar.gz 2408827 BLAKE2B 5b0f0df52ce6772a393f8e31f0161a516ff3abdb2f170ecda587ecc740058ed6b1085a223802374511c8bbd7064dbeeebe1df3282d03c4f48bdb7d93ab46301a SHA512 52ed834dc11e9aed8b50ee2d8a3d3c56a7f1748884323eaaf1337965d11f07867c0a97b5becb397536aee996e556caf57215208883d79684a6df500341414c1b
 EBUILD awscli-1.27.104.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.109.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.112.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.113.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.114.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.115.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.116.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.116.ebuild b/app-admin/awscli/awscli-1.27.116.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.116.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/djbdns-logparse/Manifest b/app-admin/djbdns-logparse/Manifest
index b0d16ecda649..17d9582beaa4 100644
--- a/app-admin/djbdns-logparse/Manifest
+++ b/app-admin/djbdns-logparse/Manifest
@@ -1,4 +1,3 @@
 DIST djbdns-logparse-0.0.2.tar.gz 23425 BLAKE2B dfcad00ddc27d85497d671fde9d51cad033d63b132b7d73e35b65825af4c222239a4815a8081eecdeeab18ec3a00237a16a4a12b647ad6520c0a8e302d0830cc SHA512 8b4b8a59567b929e20571f50bbd302280bcf2755d6e016475db20b98884d380bdeb6800a1ce815265b0655c4f5c725c28575c89f907c89d85a163f88b7a97f6c
-EBUILD djbdns-logparse-0.0.2-r1.ebuild 798 BLAKE2B 99eeb49ba9c920464b012cc17745d8a32bb1890020ad72d234ea600521b0d75d60a2cd941f12ef32dffce5a11fe790f2eefe777325ff6a68d83fb826f9653e4e SHA512 85a9038ce1fa4e553dcf2a6a1da73c647fdc527409cbb46c57f3037c924d32989c316a85e942e44f1d3b33911cf9dc68932728ed94cf471fc555f173d21fd6ee
-EBUILD djbdns-logparse-0.0.2.ebuild 765 BLAKE2B 58311221a1545a6b9b192b8e0714e3828a07e437bf5676d1070e05c97d77f015663bd3fec17f08ccab4bf3bb9fc0f243b979edc93bf33daae4b5248847704829 SHA512 b7f33271cbd311bbd5cd2c6d671d1f7f1ed694968895d6b4bc9427136fa0a18696aa2c65969e70e2fdd47b3f176182b1f775de0dad94080a409fe6764e517a82
+EBUILD djbdns-logparse-0.0.2-r1.ebuild 797 BLAKE2B f202f982c679336de7df32fd85e55f48e74e9d680f6cb6098d05a5941351bd5c9dce81d8926882cd9f1b50b9cc66d1f75f2a3153bb08ed1fb16d7c2d07350680 SHA512 42124b16a36b42e0bb839642b148f9eb38da883c880edb4364d58baeef6dd5612d9a7141dd0b110fa66d6e0a90ca92a5b2ea468447844ee044e27f16ed22506a
 MISC metadata.xml 219 BLAKE2B 27094593eb47f098fe9df926d3a827b65c2ca39ac6b03d392efe2c19d646274e5b462f65a7177ba2556a9167c994544688e53a3df810dc7f86ae43c4a75fd59e SHA512 e990bf6d766d6c0380344187a03b66380e4ed7a1554dd7a900ccf1f6f2dd3a51b06b382cedd5c73e0ad75301436b351fea0e7f1fb720c3d1345a8958554d341c
diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
index 155ae489821a..d1ccf3a1f84a 100644
--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
 SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
deleted file mode 100644
index 0b6d3d669797..000000000000
--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Make tinydns and dnscache logs human-readable"
-HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# djbdns-logparse pipes the logs through the "tai64nlocal" program
-# that comes with sys-process/daemontools.
-RDEPEND="sys-process/daemontools"
-BDEPEND="test? ( ${RDEPEND} )"
-
-python_install_all() {
-	doman "doc/man1/${PN}.1"
-	local DOCS=( doc/README )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 91b0220df8e2..bf9741ca21c2 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,10 +10,13 @@ AUX rsyslog.service 644 BLAKE2B 311072ff896b07d82e9d88b34120b4fa903b7a84c5ac9686
 DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
 DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
 DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168
+DIST rsyslog-8.2304.0.tar.gz 3274047 BLAKE2B 13c0e200acf750e9b40b14153270b0f45358ac8be7a9d0e1fa879e686da9f5a3be3b7915e3c90757a42dbdfbf4c36301cfea213aafe5a0481e1b117f28cf3cf6 SHA512 ca8df2d1d38c78d853b1081c731d9f94cad653a915259b699f3a78a88bcf9c9d1d18b91667ef954fc96a0bd251aa3afd2b6264ce5a6b4ca700687a654507b64f
 DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
 DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
 DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2
+DIST rsyslog-doc-8.2304.0.tar.gz 6586061 BLAKE2B 4680db37eaa8583e21865fafb62ba07ffa235f4184a43bf9a1930166aa26a3bccdc15c43ba26504d157339eb02b05ea95076cf738abc3323eef16e07b42de2af SHA512 1ce8a8cf40cb767e4e62016aa2513f93535a3bd3c47ef34bc1efca007f7afe5c84ca4d30e911903dc8ba529ede0a07feb05ace075b5ef6c1757e5727d11f112e
 EBUILD rsyslog-8.2208.0-r2.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
 EBUILD rsyslog-8.2302.0.ebuild 13136 BLAKE2B 0e9eea82ae95e53cce39fa765fef26a4fe934a133ca30b0ac02cddd9038b71727595e6e74d85f3a8002f32f43400634c16cd411f8ec41bab3170a6dbb89b62c9 SHA512 250f1194bd28feeea036c99d19f4302c5e9bb5f3de8dd26c19acac5dfb06062a1329f5dd88d37633c91bf63b4281a10c7319f6a1bd957ed4b777e1d378952b01
+EBUILD rsyslog-8.2304.0.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2304.0.ebuild b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
new file mode 100644
index 000000000000..0d3d01886462
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
index bc0a09172523..a2cb00f4f9a0 100644
--- a/app-admin/su-exec/Manifest
+++ b/app-admin/su-exec/Manifest
@@ -1,3 +1,3 @@
 DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
-EBUILD su-exec-0.2.ebuild 594 BLAKE2B 0212dd1ab3e77e8f744797372d036247c4facaf1c1278d8853133b4ad576e0939fd6da90f58a95ff1732a1955bb116784dc6dfd300b2b8a776911fc7dd460c89 SHA512 e1ae4026491ea64588a19b4c1abcbcc3071a24a4382e8df120d4317f0ea0b3a5394296bee3bbfe69260402c26af22ae80d884e69d1b3352ae289afbe4f1c7951
+EBUILD su-exec-0.2.ebuild 594 BLAKE2B 01222c16f58c4f46cceb43a7271805b81ff5ab6188fb99ff154edd56d1d93649d9ecd897757df5c57e636f0dee3f2da01ecff0a851c7d28a6378a14b67b3aca4 SHA512 fecd4cf1602b09e428ef18618458c2441a592a22dff87d05a462ef9d28ab411a5bcf8b4625692bd1c5b73574fc5395792c7bbec396d9b3052e438df4c2187983
 MISC metadata.xml 246 BLAKE2B e69ab482f88d8b2b8c6448e2f228d2b71c932dfa96058a941cf0470c56f6b4bd59e11249ab41821196a411e0449b45e1bde9019b7889ae7d1ec9293a858c0bd7 SHA512 b3a3e1fbadec5205d86a50ceb2b081679b4be890b1c2c266750bce5f45ef183df38242c96fb4331c5eab56506a19625ee08dd6fdf1441c21a3b8f94dbd28681a
diff --git a/app-admin/su-exec/su-exec-0.2.ebuild b/app-admin/su-exec/su-exec-0.2.ebuild
index 119e2dc77348..50948421a60d 100644
--- a/app-admin/su-exec/su-exec-0.2.ebuild
+++ b/app-admin/su-exec/su-exec-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index e0c08cd34f13..b22f7342a5f1 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -11,5 +11,5 @@ DIST syslog-ng-4.0.1.tar.gz 5452824 BLAKE2B a5c0328f3c88a38dbc07bb7af2a74c0037a6
 DIST syslog-ng-4.1.1.tar.gz 5556174 BLAKE2B 3e1a9c394b8a88cc7b39a026950760cbc7796d67b62bb3c0f2970fd80c296e9bd75d1057fe81a0d22ac8488789d13607f19abc6aa38b3a38a30ff450ee66e3a0 SHA512 89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8
 EBUILD syslog-ng-3.38.1.ebuild 4904 BLAKE2B 756015bb90e4d93608cd20d94406ae186bd9ac730a07c2dbd7e5034fc7b91edf5e4cb442fddfd0b6a0fc1f6e295f34bc85f28c2eee5d2c1417bdf0a8da3df76d SHA512 4ac6c11e784eb28abe38f7ddead8e02bfd5f3eca20d46d451fe9f968c3e1a4b17f5d0ff904e064b8d5be1fc8425e5ee8040a021b19ff9dd30908529fde7fe061
 EBUILD syslog-ng-4.0.1.ebuild 5116 BLAKE2B 00723fb39423ced4cc1c70942948e7dd6b85b21af80e8796df65ec3879c2ef3d99b788ea7be16b8477ce5104632d55a00b2fd0b1a4cd69eccc40743dd0f96e01 SHA512 d81cb32892dc82bb0affaede3141ee0aa9bcc0d029986f7c897f05af596747f8b8faca2b7e2cad026b31a35fe01f54f1aff6c219184ce3dff7bf992f7a5dfd15
-EBUILD syslog-ng-4.1.1.ebuild 5119 BLAKE2B 8123082100e326f454250315de69b3aea3e412805e6eb492e37cdb063fbf4bcc9a27e70af774b5f746059dc58fb80a5a4bb33b682a7282ab7a3d51996425aa62 SHA512 8fafb355beaddd99ff637ee3415d499eeb82cb793fa4b522299e767b163d60595471d683092519b29e529d163518050618945e22c7e051740b636a73596f9971
+EBUILD syslog-ng-4.1.1-r1.ebuild 5196 BLAKE2B 40f06ee661e9b74b3dc6497e79c2e74f8daa16744bb68bd50dfc9dd1aeb9691920e3f1a944049489ee442e89fad0b89c56b052ad2234ec3c85b41a3dbc670c0b SHA512 408226a572889d7f3361cc7265123861e959ae1dcb8bb81ddc7240894a557c241d1ec90ac6694f809552365aa55e86585e6b621e95e36768700f5a66f80fa2d2
 MISC metadata.xml 1285 BLAKE2B 91f0ecae07c9131f516a2b9dd6b71d021c84cde055ec58b21734b36f540f65b02452ac20dffaac4a3edc8942ad9a1a1afc3c9837ea4775d40d0d8b3d41083316 SHA512 80924020dccf9bd8d1a83d995af57644eaab761204e2b75a3ef997a2b7582506ba25f476b6203446d116af841629520adfa1cfe443c6e1547755e72956161eb2
diff --git a/app-admin/syslog-ng/syslog-ng-4.1.1.ebuild b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
similarity index 97%
rename from app-admin/syslog-ng/syslog-ng-4.1.1.ebuild
rename to app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
index ca7e9ae7a1a9..f2600055a7b5 100644
--- a/app-admin/syslog-ng/syslog-ng-4.1.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
@@ -32,7 +32,12 @@ RDEPEND="
 	json? ( >=dev-libs/json-c-0.9:= )
 	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ca6bb08825e0..333799e8c1da 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/vimball/Manifest b/app-arch/vimball/Manifest
index 3c7d05128398..70b5988bb3d0 100644
--- a/app-arch/vimball/Manifest
+++ b/app-arch/vimball/Manifest
@@ -1,5 +1,5 @@
 DIST vimball-0.5.1.tar.gz 5246 BLAKE2B 8ce95bfe8872f69e501b4453e5a6644d8019367173f8675325775dee58e08618b9ec0908bca9df04839bc165b086d8e5195a0753827d6038d8ccd8adbab80c35 SHA512 f89ba7291e3f4146f2ada7934b0ca74524abc639e586da12e19882e9aebe3f14858a6145b830a32dc19b0deb61f652375d8a56dc7847fd0061d14a2d77208549
-EBUILD vimball-0.5.1-r1.ebuild 551 BLAKE2B 975810269085d8bc61e76bd21c1f5803b8e3d66edd29e9efd772ade3db37f5195236308f7f3ea9fb323807ed830ddbc031492681add15f2df3f971a2db71a8d2 SHA512 53603e894cc4ffb6f3fd0b69249d5f26b10581ca593f6313b9c5064029777b24a6e81cc8a22c16ebde4ac2d8aab0893fad873a9eb9aa2ac171a119643e44d028
+EBUILD vimball-0.5.1-r1.ebuild 549 BLAKE2B 7a12b1836f96270ae6f32823a4bbb33ee5ba0973f70e455ead33ce9ade14ce739358b31da02b3d61d8466d7f734674518ed16b384579393d245d3054ddfba506 SHA512 47c414ad4af05fb0d974d9505ef93b8f7f952f50d1ae9a9dcb53d4dcd5dc9e792ee9479d38dca381390f3688afb70e4b2d950488a1711c9138f0c41aeb4b51f8
 EBUILD vimball-0.5.1.ebuild 510 BLAKE2B 9ad8fea912610cb066b9013b0ddde4a97ee4a3024442f0b83dc655e131e48fa88b07483e21d10f00db8439e5fac10ec1ca98d23291226398555e7e89e30640cd SHA512 2b0d48e23146c98304b036f1a85ee841fbd926e1967c36ce68f45198061251a10208d1e8f28aa5caa2c77aff7ddf66561b4854b5199d298a567e1987cb154a44
 EBUILD vimball-9999.ebuild 551 BLAKE2B 975810269085d8bc61e76bd21c1f5803b8e3d66edd29e9efd772ade3db37f5195236308f7f3ea9fb323807ed830ddbc031492681add15f2df3f971a2db71a8d2 SHA512 53603e894cc4ffb6f3fd0b69249d5f26b10581ca593f6313b9c5064029777b24a6e81cc8a22c16ebde4ac2d8aab0893fad873a9eb9aa2ac171a119643e44d028
 MISC metadata.xml 302 BLAKE2B 9a62e3ddd0221a93e319b7d4b10226a0f1a9f136f856a286c09a18b10cd575a4735e97aae127b26aeaa6884500ebd5dc69f630bf2f8eba0c2710b318f9bbbe4b SHA512 2a6a6012078822bc42c369427a42341098b4dbe84676573d2fd8e9699da735123d98bf22bbc816b2d55fa604052f45b2fc32f949239300dce394bc603285df25
diff --git a/app-arch/vimball/vimball-0.5.1-r1.ebuild b/app-arch/vimball/vimball-0.5.1-r1.ebuild
index 368e668cb296..9f4edd4d930f 100644
--- a/app-arch/vimball/vimball-0.5.1-r1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/radhermit/vimball.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	inherit pypi
 fi
 
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index e8487a831086..401c91206bed 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
index a1e719345c9d..8d4c3de534d7 100644
--- a/app-backup/burp/Manifest
+++ b/app-backup/burp/Manifest
@@ -9,5 +9,5 @@ DIST burp-3.1.2.tar.gz 549260 BLAKE2B a8767d9ac2188e7a44fa2e8e4ba08dd3a5edeac268
 DIST burp-3.1.4.tar.gz 549879 BLAKE2B bf70051a658700fab60182b97b7ce8540fbd85ad1264ee09c9fa5b5a99046f391b91cd8673097ef869c6b762aea6d8fecdedb38425dca9e6bcbb1f2c2afa96fb SHA512 3aa9fb1512f985fa99e7cb9a45502bbdbf513935e0c62fa4327f0e6cb68d3840f59bfe1b38a7c2419b3e69bc04aef36c223313897c2e45e94f3be3f9d41714db
 EBUILD burp-2.4.0-r2.ebuild 3024 BLAKE2B 3e055fd9b6baeff748ae0947153ddecab47630cee644d1a2bbb6177f250932c691d53e9612c0ff78b29f9aab7cbb0a1be69ee54e1dc2d577f7fbbc3b9cd7c024 SHA512 7231796aa70493cbd18561e11f851b443f4eb8de3a85bc43a0d5bf3fb0384171b2743a1f94bd4c65606a867600717e777a9c3657884c5a08dcc64707cc11f10e
 EBUILD burp-3.1.2.ebuild 2912 BLAKE2B 0782d49dd644c5d9b866b90420d141f0a992806276c1cdd817e2f8ed62b457786fcb10bdc079340f849c06dabc61707bb8ba961ba118f808cc009cf919f0f815 SHA512 2e8932759288762f43eccdcd43ca11659e8a67623b4f64e23eb8162c9f68c2df9fc8babbddcc594d51ba139eea8f7726cf625b21b441662781aff1b13d6186db
-EBUILD burp-3.1.4.ebuild 2910 BLAKE2B ac1f4b6507c5e9865639bc01559feff1857f6ac08151688442021808f44780f863a9ef640cc2f9828bd62f66db4827ace7c7d76a87fdb214ecea74782a339c9e SHA512 64cfd33781840d41d493fb6b03eefba8a56a1f145de1e23b8d84a74b52096cec61123b3e16440963691aa5443f70bd56636a7669f47e70f9eccbfe37b6433be3
+EBUILD burp-3.1.4.ebuild 2908 BLAKE2B 6cb106614254971a70d8275a6c38dfb68d7813779c6d6c3914be8d5faa494c03ad8567467d6c7eeacbf6d1403c5af004b79ec4fe5ab1560505362bd592674dd1 SHA512 2cba92b9ffd929615fbdc745b9230bfc2ff307f30eff24c630c3f43bd77b9aee35f4f0c2df3be3ef64fd784f5d2166796ae80c98ef2c5d6790f9c2feffa6b427
 MISC metadata.xml 824 BLAKE2B 144475d686773901cee9f3926e843a2d9b3cab8a9db0c2b6d590b389dde0dda059bb06abb74e015d19a1f1ed60c4a2c7a11c06bf35e93bf1be8cb2a702447558 SHA512 1cc41b5f4c4d31355824a595f778702b79bec6a45b398e503834d55408bdbbf708bafc7c364f5fc038e31eef26baf4adcd8cd922ac18f6a41b5be446eb9ebf0c
diff --git a/app-backup/burp/burp-3.1.4.ebuild b/app-backup/burp/burp-3.1.4.ebuild
index 1efa9828e50c..95d8bcc462d2 100644
--- a/app-backup/burp/burp-3.1.4.ebuild
+++ b/app-backup/burp/burp-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="acl test xattr"
 
 RESTRICT="!test? ( test )"
diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest
index 02c5e88043c5..485f1abde89e 100644
--- a/app-backup/untangle-https-backup/Manifest
+++ b/app-backup/untangle-https-backup/Manifest
@@ -1,4 +1,3 @@
 DIST untangle-https-backup-0.1.0.tar.gz 17211 BLAKE2B bbf8725e3198573b287624850cb854c5c5c5dffaefb4546e9295e21771f8e3d25652c94be497c9932caeed5afdf1afecb15aaad75f1ff2f53f6c4b92b3ddc23c SHA512 9874dbce881c419345b6e77a1e616b4c3e97f441606d7353b1a77c680bc48715d8f70f45680f8b57a447df44d9d9346d7aebf394de0793966734b3d9865bc18e
-EBUILD untangle-https-backup-0.1.0-r1.ebuild 604 BLAKE2B 8269cca0e12c22afb05e9cbd560b2c7bff8fa7ea324f8e4df98746150e0bf2439139b27090f48fee160af497ca669abd8b98346266d2504763f1d4354bc02999 SHA512 d8e4ca04904ce34137725939571eb9d6e722225f204770cc3c1d805d8a7de36468276467002fd9204186eb644dae595e15465d33b217eda7b35240a053cf6955
-EBUILD untangle-https-backup-0.1.0.ebuild 589 BLAKE2B 0af2ea2ed792d421153ba0fde76afd356c3ea10311478a9d14f5005e9a499f11fcc1fddf0a26ba983f468083df150cde13a63eba2703e156a998e027918fdb3a SHA512 bf8716fbf76272ad856f75ae6f359879934fbdd8ae14f76c6caa2a7d4c83886be69682a82d94539acee0434a2b57b294b3a6142b1214655f63f1576379f53b05
+EBUILD untangle-https-backup-0.1.0-r1.ebuild 602 BLAKE2B 1a439498642472b352879d25cb0e494bb3d5daaccdfa899d96281e2d02dd028c4993204b3fec28bb64668e7caa6055ae2ae050828adc4a313c9820b057164583 SHA512 289f040ea5538be9744c3be78e65117e457b028e42f8d22f82de51eab310a99c4230a94604dd5d66ad11f3f366907180333810f5eda099e0a89d48e4287839e1
 MISC metadata.xml 253 BLAKE2B 63a51cab94d3e978d2c7dd1d124efd1c9e11c5ae277806a1f12359b2db370c37382fc1947e85940f6b0a439e3d49eecdd8d9bfb96587352d6a83803d2fd40bb6 SHA512 8da7cfe0cd26a54c106f2c029bbde93abf77576835e4fa66bc538dcf12fd41160f7cc2dd843a221962bb9a6f965311c076a1557caa38d503f371569b84841e33
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
index f2b4cc6ca8c9..d0bdf8d5117e 100644
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_install() {
diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
deleted file mode 100644
index 74acc6fcb52d..000000000000
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(  python3_9 python3_10 )
-PYTHON_REQ_USE="ssl(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Back up Untangle configurations via the web admin UI"
-HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-	doman "doc/man8/${PN}.8"
-	dodoc "doc/${PN}.example.ini"
-}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 068e83bf2761..7b209cdb4ccb 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index c953e094b363..9312b1a0c41a 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,3 @@
-DIST stress-ng-0.15.06.tar.gz 3813785 BLAKE2B ebed2b6b087afc615e3a94ae239df32a7847f1ddc5db83a733ce8415d76818000bb742604643ebdd06d13e584a66c6814feb660752738f3fe7e714670e4ad396 SHA512 a999ecb813504cdcd56cb3f9ac6633c91ee3df2c203866d29fb04b61c41ee5e7738ca84cdbdb2cb8c6fe969f29a64d21a8df17419901266efc7f1170eb18013a
-EBUILD stress-ng-0.15.06.ebuild 1130 BLAKE2B fc3d5a4923409e94a3055fd018997c32f477dd0e4543adb0fef18a4da066dfb0043ca6805107070aab1cb2804d908aa68c5b2b314a198bf19bfdc18e5fc88ed0 SHA512 1ed861f794c8582f83f17dc353945a821cdba776fd31d0832c26d2d3127026a7d3bb33baaad83d407ef347fc5e1f568c08d4623cb23a9b8ef4892f7975a44fd8
+DIST stress-ng-0.15.07.tar.gz 3830971 BLAKE2B 15e4aec04313a1c286c080a9a4d646a7908e213fe8680fd105017a23843f094185ee2564b497d8d3103389b6b9d6a512ec150a47202a59c4a4dad554425f655b SHA512 f6ff566aecaff1b98ce74a95c4bf9fab3fd2085c2d9805e6b1c2d1a1477e0af8514f37cab9575b4b4d5079e3d26dffd16d852c72ca0b98b840c2d84ec19bef66
+EBUILD stress-ng-0.15.07.ebuild 1130 BLAKE2B fc3d5a4923409e94a3055fd018997c32f477dd0e4543adb0fef18a4da066dfb0043ca6805107070aab1cb2804d908aa68c5b2b314a198bf19bfdc18e5fc88ed0 SHA512 1ed861f794c8582f83f17dc353945a821cdba776fd31d0832c26d2d3127026a7d3bb33baaad83d407ef347fc5e1f568c08d4623cb23a9b8ef4892f7975a44fd8
 MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
diff --git a/app-benchmarks/stress-ng/stress-ng-0.15.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.07.ebuild
similarity index 100%
rename from app-benchmarks/stress-ng/stress-ng-0.15.06.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.15.07.ebuild
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 94f6ba30449b..a9ab07d575b3 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 70958ab99c3f..1482a39398a1 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -5,6 +5,6 @@ DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a9
 DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
 EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B bf3402c6139087a39c13b23710b981f36d7e6f8802ae40d9fabc7360109b2332c8b6d9042c46248c75655aded07ad6ea6a9a69a25c1fcf43a0f53999adf54c25 SHA512 86b1860c5414c7ae77f41e8b4d379332762f10bf5000d944d04ea4384b1baa1d4e9653c98bef32aa8baae4d0c520b5fe23b54fe44286a14c4210e447399a6186
 EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 1b64296bae273bb6ff90991988d94b6470fafe365915183d52e8d56106702fc30d856dc6e23eb7c094bbc4f12bee70ead77d03a31512dd89fed6824ae3151c43 SHA512 43f0a4ab7009a6a4516f30a7432a9a11c60b33a8e845eb9ad0d64f1e9f091cb2fbb32baa04cbdc034d9fa23709ec79cfe2dba12d19588b5b33326c4696d595bc
-EBUILD docker-compose-1.29.2-r3.ebuild 2003 BLAKE2B d1e7de7c5a30ba4bf7d0de36de4da1778e66f20c761cd4edc8801d093dec2c5f882d9997ad60ab039ac048c1692af628a0c3bda94c0989e04f6c269c5caa73cb SHA512 acae66015644f268d94778edc88565016e6a171cc8e4185a9c9607375efc775dc866b8354296db03e2bdfc0dd11691c09ea76f2244618c075e7777dd664ad55e
+EBUILD docker-compose-1.29.2-r3.ebuild 2001 BLAKE2B 15d4d03a2955fb37c790c5e7f9b587888a97e7790f2796512f4765245c9a8b76aebdd3804e7f98ae63e29d4ee3e74842bb77fd9e31027f6eef3c284a91b33445 SHA512 338f9067f522982eb767d4aeb78a2925ea8e6ee61239c4f73f4b52ff09a0ecb6eb680b70ad23c2b4e634e71e7df10bec50cc6bebec0e58bdd74f4e170a1a7939
 EBUILD docker-compose-2.17.2.ebuild 1156 BLAKE2B 9a6d68382e2d6912a77001c9da0bea27548c0cab28e233455b91cf9cba65cb137ba5990d1f38ff164d466bf2dadf8534487867f5f1b3a23624878f37b008122b SHA512 a74a21c6fc62fdb791909958c2967f77235458db9b1a6489b5dec0fc712bc9b2a6a7c7814464d52be0c0e7ced3e275718de076f48cec497635cb22cb14c95dd7
 MISC metadata.xml 689 BLAKE2B 99d0b18b036a6570a862e3d0f4401c00559256fe0b8f925085846297de55bce4a2b9fe1c5b0f535cd0d16dbe53897155911b8edd791b50e085a976eec4efd8b7 SHA512 565037e956a654d01ebe5a29d4995e7f3df916f2fce7e95d2d2a6dd200f5dab5b67f7d52d6aaa98353578fa3b8b20c865761c040fee538e780d690c45ecb728c
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index e27bbf0f9c99..4f274a47deae 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3f540e9a629e..a03e61e4355e 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/codegroup/Manifest b/app-crypt/codegroup/Manifest
index e6085055b71c..2ceb8c049dc6 100644
--- a/app-crypt/codegroup/Manifest
+++ b/app-crypt/codegroup/Manifest
@@ -1,4 +1,4 @@
 AUX codegroup-20080907-Makefile.patch 340 BLAKE2B cda48d034696257aa1f6852fb59109fe7ded48932198b9a583def8fafeabcca2493008d10da7002c7c808abe246cacae78a917a68198ac547d9f37baa426796e SHA512 55a4b8f9c8be54d48ce4f85839343c8cbb3a6dfdcf57b9552a66c111d5e48e1c6868e98f29622c4a7df58cb6ebf75f1e8748f7bf0996c05ab3c41f10ac504353
 DIST codegroup-20080907.zip 69123 BLAKE2B 06bf14527c641c9df16d60a00044b0acbceb912df9641f73280e958d35a7ca4998aa4d5bd411e432780ef715529532b3d4ce645e146143a833cc57bef5d799fd SHA512 3cf7816fe1c4c3b70cabb6e8518f6057cd04e735bef5569aff4b8753005ab33e5c4ac80bc434a45fef75267964ffe25fbfae9d72cffe6db075b4cafeb2b80e93
-EBUILD codegroup-20080907-r1.ebuild 602 BLAKE2B 2b694061ecd11efbec7399df525fc9f6d30ce052f612715879461c8e4ebb578c9103f76a93d924da68788c1f63bfcb05b1cb263cda420b50e4aefd4486ff70d1 SHA512 9d38ae2b8e6321a23d95df90f831584df819b88cd98ddabf9dedb013d77aa2a80094d6256906053b60a41cb75e8a2b4210b3d530556639636bd4362b1de3eddc
+EBUILD codegroup-20080907-r1.ebuild 583 BLAKE2B 4f092c8c93b583d7c5004a0819ded68fa3eebd58b36d150ceffbb22197c1ec44bb47c906a7a86371e3f42914f54b7a380737dde0728a7a8a5d559501840f1862 SHA512 94e3e2d01fc26c9777923d3efc4227dfc461fc595c7a245927591a026ca5dafbe6971f61160ce3498d65bb28a1ddf1292509425b00f962fb31b11f0e94b76bc6
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/codegroup/codegroup-20080907-r1.ebuild b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
index cf15b9cc4d11..c2c90842bb18 100644
--- a/app-crypt/codegroup/codegroup-20080907-r1.ebuild
+++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="encode / decode binary file as five letter codegroups"
-HOMEPAGE="http://www.fourmilab.ch/codegroup/"
-SRC_URI="http://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+HOMEPAGE="https://www.fourmilab.ch/codegroup/"
+SRC_URI="https://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
 PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_configure() {
diff --git a/app-crypt/gifshuffle/Manifest b/app-crypt/gifshuffle/Manifest
index cae9cef6d544..0289605f1748 100644
--- a/app-crypt/gifshuffle/Manifest
+++ b/app-crypt/gifshuffle/Manifest
@@ -1,3 +1,3 @@
 DIST gifshuffle-2.0.tar.gz 21509 BLAKE2B a07490c2f6a29782d7d25219eefbf49393ccb06b1fbb260927dce741450934990673cc86168285ec9d0bc2ef258a64d98d623f143b464b48c9955b13a808822d SHA512 0a0521f924c508c80c11309203e64cbd948945ddd557f01008a39987602320be780c1710dfcaa8ec9886fff4e9745465f2f242919ede4cedb2af9f73e5cc54be
-EBUILD gifshuffle-2.0-r1.ebuild 619 BLAKE2B f1d674630abb76d3432be5f8c80cb71ae9fef3319ea1bbbeb2c7ba8a63f50bc7e0c1d32dd0f7fdba8de9c41fc554b8d2a24a9aa4eb73f9e22c9c877d8e0d453e SHA512 4a6f9cda8dca0cd053b70f663db20d8be78bf5f1c0de4221849d73d26e081985177786050ef20ad2a982a57adb269f3b3a4b8550893fe8991a6d63fdea4f891a
+EBUILD gifshuffle-2.0-r1.ebuild 582 BLAKE2B 196fee3f4f55a152505a27d3cfbbfdc508ecb502615b60d443d7ea23e5718008cb4c7e34c2fc4e14a1e54c93880168df72113a2efbe9b3dc84b7b9d863a86776 SHA512 85008c0dbfe05eb1c758ade8c9bb39eb643f799819bce1a7d685d858a629e7260f1618d40fa9937cbc641b8d7c0b4b2c7c0a5388b67999ddc70a818ab5852cc7
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
index dc85560e9fd5..3e067e72568b 100644
--- a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
+++ b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
@@ -1,23 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="GIF colourmap steganography"
-HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
-SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://darkside.com.au/gifshuffle/"
+SRC_URI="https://darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
 
 src_compile() {
 	echo $(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c || die
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index eeb678504987..eb6f2dcac7d8 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/kicad-doc/Manifest b/app-doc/kicad-doc/Manifest
index 27ae064c97fa..ee6a938f7554 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1,6 +1,10 @@
 AUX kicad-doc-7.0.0-eeschema_advanced.patch 597 BLAKE2B aa62c9ca99ea9202931797f0eb9e074ff86576efb355efac865e0e2f4edb096f9fe06f47cf173dada98ad87e91cfde9530a82263c319df246d92dcf0af661708 SHA512 73fabf9289a0276ba754d3769e70cd10975ee3b9a96c2ea802401dd11cf3c3e6f42a9c1fdb034fac7fc664c2f28a694f8713cef629dabb0885a147cf87ec46de
+DIST kicad-doc-6.0.11.tar.bz2 79253772 BLAKE2B 904c01cd00b1669620018194e98303c00ba2ba32b44fed2f36966edf40487c26b6a7ed827a0c35908eb74ea04054a0c7cc39d371e5c6013bee484bf2b67f6177 SHA512 1c942a53dfcf071e83d5b7674df446b55818961da69586fe772467e4cf7ea64a13de01af20ec087c8a73f9d101a5a48680d840415e1a278e2ef5b22952980180
 DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
 DIST kicad-doc-7.0.0.tar.bz2 104561946 BLAKE2B 1f19b489a3b40e15f9f4a775582caf192180b345bf559d8e2b1954b2c72301ad25264e7bf27df46ba9b2a52848478441df383f5766c7111340b04aa45720f40a SHA512 b3cd797751b3183eabadd71e02031ff0b3e5d4744e1c55c16ae5b22bdc45f7cb874defde407d6d819b7c00b06daad84260b980f9afca1f5805c17ebf177300b8
+DIST kicad-doc-7.0.1.tar.bz2 104103280 BLAKE2B dbdcd82e65c9d3a2bff629f8fa4e3cc34c2adbfa3fe9a808e3802addc3d75f3875ad52c4f5e79cb2bfb7563a6288d0c2eb6f119adf4f7fd2f31360cea82d1ea7 SHA512 5274ef673db9e415d5b82522681acdd4ee2b2f615bb52abdd11ebd17b72f36852ee297fdb98f9cf1dee12671a23adc24a6a8a03be720b579bbee7a9ead167e41
+EBUILD kicad-doc-6.0.11.ebuild 1953 BLAKE2B f332ae1aba1545ef3e829a188a440e69cec94db2c0d8974552c381e0a526c72e6df38c77ab37f5d0de91728338f8e6f1d5544fd764df01b553c40cbb56491b05 SHA512 78d4a0b45b946c53929aaff58f8d0fb9be6c06a7970daa18af88caf5696aef92b6bf718bfcfeb5f404fb2d3a17eacffaa95004b9769de9f55ff29b67cdd5f7c4
 EBUILD kicad-doc-6.0.9.ebuild 1951 BLAKE2B ddc5726a9b11c2aaccacb932c44a0bbf5478c673118314e831a7182f67f0075bfb4d485d89cc351b11bee1f0ee46e2bb70d0b7bead64a529300f388c9cd70ee7 SHA512 09f93b3466705ee7c70d4c55099031ac6bd919c8550c832e266c7627bc2f7376071e4bdfca1e63c23030bb9812c0487106df6a82ba59e33ddbc0113d348fb737
 EBUILD kicad-doc-7.0.0.ebuild 1868 BLAKE2B 690fb1e0cbdad798da47cb5785e6e38892c774767cf3ceac1f94184c1eff773dd2940b2774592254f6910f706e3d3d988b4418f54dc85af82276d26a8ad83849 SHA512 72478bb677432d5c51020a718df6eac38901d7490de834112acb944ff58bfa469aadffd8462c6418d2450c6ca18e77be44c4c9d8557d7975f151eee7f633d554
+EBUILD kicad-doc-7.0.1.ebuild 1811 BLAKE2B dd463832069201a6775846383f74bc0f3e04426307267153960e6d6248e862d53c0d87c93fc70672c1aefa3030f20997009fb8c5cd7d076a31960e75c1ed5e3f SHA512 b800a6f5befc4d0f293767ac85e56c11b136023f45186a13285d3629b100df55232d4d83188d02dc5af5fac55c9265b68bfad75d68ba94b1621dfb6d952321ba
 MISC metadata.xml 861 BLAKE2B d1cfbf0b3a558b876cc446ffb27ac09d0bac29328d370b064f950117692a0582adc48cac4c8d887ac4151aae72c8cbeef20b521da166a77c7a787951da812f8c SHA512 3d12ebc29679fc7b7d2a75d5d33a053dfb21c96213aa98dd8350f4eb364a4149e35b0f18ca6d9e59f86e57df0abb59e182c7f8fdfda38e4bce8a5308009c85fa
diff --git a/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild b/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
new file mode 100644
index 000000000000..2c31830221af
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +pdf once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		# May not always work?
+		# https://gitlab.com/kicad/services/kicad-doc/-/issues/808
+		-DADOC_TOOLCHAIN="ASCIIDOC"
+		# Note: need EAPI 8 usev here, not pre-EAPI 8 behaviour
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
+	)
+	cmake_src_configure
+}
diff --git a/app-doc/kicad-doc/kicad-doc-7.0.1.ebuild b/app-doc/kicad-doc/kicad-doc-7.0.1.ebuild
new file mode 100644
index 000000000000..c8d6e1ad547f
--- /dev/null
+++ b/app-doc/kicad-doc/kicad-doc-7.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +pdf once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=dev-ruby/asciidoctor-2.0.12
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPDF_GENERATOR="DBLATEX"
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
+	)
+	cmake_src_configure
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ba9fd73d8d56..dd6d16aecd62 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index bf6f6d8cb330..04c89bd296bb 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,6 +1,7 @@
 AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
+AUX joe-4.6-c99.patch 1427 BLAKE2B 0092531265346574f1bbfbe8a3d45515ec5ac817794cf35c65f695296df2a9a4e4a570fc6ff507da4ae02eada4e31f54f332b609766ea357d73d34254b2d8460 SHA512 201e74d0af44a5c4c9cfd665a2a79222246e535deab017f6bf4884215644e89921a08b051f7ba43cdf8cdbbbb15a17e729088ced4e4b6f57e84c4472b28691bd
 AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
 AUX joe-4.6-prototypes.patch 10006 BLAKE2B cf9845339aa30b99223412a9e2c6407bbbd2bb6eb5ce630d3a7e93bc084ee8bffdee97e15ce17765b6a5de9fcc02453b4962126043fe021cf17e6c062b13108f SHA512 9ccd53de36e813c79dbd1c76e43c7f9b756243455e0faf7eb98e8ebeada30256393475270a9858c6f319f28b4fe56f320e81c7898e41cf8b4ade1c22000e6884
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.6-r2.ebuild 1479 BLAKE2B 10ac5cae3afdc72b26c3ed032ad779ca67adda50a9e09280bb18aec84a41c2c9190aaceb0f635ac30e75924865f5c3a999e29f88bd0d05a424beb6a2ff317967 SHA512 fccb98942103f2c1d16fbc3941e52c8c094612001b50500681106674f81780dee0e7e8108a42daf6a7ff8ec717aba6a62239d2e5e9d43f7686519551dc6ea423
-MISC metadata.xml 905 BLAKE2B f744fdea647781d08644ff9e1b9475706569b961ad433eec0e3f4a424c0fa8b4128b4978d16bcf14533eeb3fe9006f89c61d1b7ed4913070e4f8c2cafe509c40 SHA512 a2e4ff282ea424f6bd383871523760cc7e555a75489822da5fd010eca7ead013628df767d2c81ed26853aa2493577bd858eba436bd900bc6a268b3344c3ebae1
+EBUILD joe-4.6-r2.ebuild 1509 BLAKE2B 24b1b098d1e31d2c951b70c053a9be9680e9098bb8d3c0145825c4e2131ff425c889fd667d1d0d99462aacec13c9bb0cff7d925c2021b4555fff0aa61b6e6ecf SHA512 bfbb9a6449e437179c1c04c3b4ce4b5a8f1494bdb4bdc779e73db59624743b822f97e88595283d6b0562ca3968118d8693052b11c124e1c4d49d596f2296994f
+MISC metadata.xml 904 BLAKE2B 687b43b7f2d927f5b239ce63ddbcedac0d602cb0a1f51a108c99c5227f6cc9501f357e1e6dd407ecd231bfd6d4ec0acb513b495a86ea7dcb52a0e735cd87012a SHA512 1d9066383090e2fd69955899c9c8e35e58d60f35d3b7e7d29c7cc5184c23f39bd24df5cd59efb9321aa2a8af453849366c8a931c369c9683f9b1aacc2030ad24
diff --git a/app-editors/joe/files/joe-4.6-c99.patch b/app-editors/joe/files/joe-4.6-c99.patch
new file mode 100644
index 000000000000..8d7a64a6419f
--- /dev/null
+++ b/app-editors/joe/files/joe-4.6-c99.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/900164
+Patch from https://sourceforge.net/p/joe-editor/mercurial/merge-requests/3/
+
+commit 26e83257075789d901cadbe280ff7f1bd7602983
+Authored by: Nikita Popov 2023-01-31
+
+   Port to C99
+
+   Ensure that functions are declared before use for compatibility
+   with newer compiler versions.
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -9,7 +9,7 @@
+ int main() {
+   int a = 0;
+   isblank(a++);
+-  exit(a != 1);
++  return a != 1;
+ }
+ 			],
+ 			[joe_cv_isblank=yes],
+@@ -34,7 +34,7 @@
+ #endif
+ int main() {
+ 	/* exit succesfully if setpgrp() takes two args (*BSD systems) */
+-	exit(setpgrp(0, 0) != 0);
++	return setpgrp(0, 0) != 0;
+ }],
+ 			[joe_cv_setpgrp_void=no],
+ 			[joe_cv_setpgrp_void=yes],
+@@ -95,7 +95,7 @@
+ 	kill((int)getpid(), SIGINT);
+ 	kill((int)getpid(), SIGINT);
+ 	/* exit succesfully if don't have to reinstall sighandler when invoked */
+-	exit(nsigint != 2);
++	return nsigint != 2;
+ }],
+ 			[joe_cv_reinstall_sighandlers=no],
+ 			[joe_cv_reinstall_sighandlers=yes],
+--- a/joe/selinux.c
++++ b/joe/selinux.c
+@@ -6,6 +6,7 @@
+ 
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
++#include <error.h>
+ static int selinux_enabled = -1;
+ #endif
+ 
+@@ -108,7 +109,7 @@
+ 		return 0;
+ 
+ 	if (setfscreatecon(0) < 0) {
+-		error(0, errno, joe_gettext(_("Could not reset default security context")));
++		error(0, errno, "%s", joe_gettext(_("Could not reset default security context")));
+ 		return 1;
+ 	}
+ #endif
diff --git a/app-editors/joe/joe-4.6-r2.ebuild b/app-editors/joe/joe-4.6-r2.ebuild
index 1f5bdf049228..ef18848b930d 100644
--- a/app-editors/joe/joe-4.6-r2.ebuild
+++ b/app-editors/joe/joe-4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3-tinfo.patch"
 	"${FILESDIR}/${P}-db.patch"
 	"${FILESDIR}/${P}-prototypes.patch"
+	"${FILESDIR}/${P}-c99.patch"
 )
 
 DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml
index f53c3664d7de..cd22587519d6 100644
--- a/app-editors/joe/metadata.xml
+++ b/app-editors/joe/metadata.xml
@@ -15,7 +15,7 @@
   user should expect: full use of termcap/terminfo, excellent screen update
   optimizations, simple installation, and all of the UNIX-integration features
   of VI.
-</longdescription> 
+</longdescription>
 <use>
   <flag name="xterm">Enable full xterm clipboard support</flag>
 </use>
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
index 62b89dff3fce..af8d643881c8 100644
--- a/app-editors/pyvim/Manifest
+++ b/app-editors/pyvim/Manifest
@@ -1,5 +1,5 @@
 DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
 DIST pyvim-3.0.3.gh.tar.gz 492633 BLAKE2B d62f1db2ec4af635841d18c860c5ac571c664116c539bab87b5f00a9c15b1f37f9dd53649d98a3d21d3bec9df0af46d18443eb1b34961d0971a7ed75df6a8c74 SHA512 0af9b772b97c21b8a9fe966497849eb83c6f770a212b98c7f261309f2f70d6cc8bcf2175660bee5c44850d6c805570946a79fbe9db7f1ffa8e20e19ef61a0635
 EBUILD pyvim-3.0.2.ebuild 849 BLAKE2B 5c08895d06b830160b61403451d840bdb1d2895a8a8e1f06160459a823d02f490df907d2ee6c165c1b2d023d0479b0acadde751d48aa82dda27731f9137597db SHA512 3210501d06d5170441ccd3dcdb1878d30b352258073daf8b63bb01eba7162acb72b26c95adcbc4b2e0e090b000e2af0c733c5b9cfc750975d574e7b696cba7da
-EBUILD pyvim-3.0.3.ebuild 1013 BLAKE2B aa4a64282705cc8045f42746456c6937dd44e8bde5e615a3588f8d245673d5a02bd9372d15be14b5f8596195948d4cf45970ad0d914ebeea7f722d84e65259fd SHA512 5599ec2aecd3282272fed94776fad491843054aefe00aec0f54b1b199e8ed56a66379aeb7d7c2f1aeee583c4244709d97fdc1fbd73313d1b264a8a1494a2d257
+EBUILD pyvim-3.0.3.ebuild 1011 BLAKE2B 716be0654455cff0c4900540be6f52deaa0be7ea19a98473670501e66b150a649bb27000cf942dd52e2bcf3ea1c7dcd65918118656bf40ec150165e0c79ba7dd SHA512 5dea30eb974395d060a3a054e5c2a12825e38e88f42fa138aaaf95c9b53c145e28c2b71949243e98aa1842ef42d19bddf5ca127886f61648d1e27caa10521ce3
 MISC metadata.xml 490 BLAKE2B a4af1d63730b2d7d6621d0a6fd3f4205016a940cc47d84ac48a692aa2d27c075f146d6a3d2581558af19cbab614fe47d9f9cb3679899387b2dc84b6b0f52c3cf SHA512 5eda2f764c81d21304541fe5d8c8330535d94b382b8bb94e9d15f01c184d4e09a6780dfe3745d4e3661c56e5a5a564147fbd4111fdfdd12b7075e1b9ad06488e
diff --git a/app-editors/pyvim/pyvim-3.0.3.ebuild b/app-editors/pyvim/pyvim-3.0.3.ebuild
index b7b0ce362859..984c32f845ed 100644
--- a/app-editors/pyvim/pyvim-3.0.3.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5c5b8b708f72..8603e80d568a 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/all-the-icons-ivy-rich/Manifest b/app-emacs/all-the-icons-ivy-rich/Manifest
index b7cdbefe2bc4..40ffbaf75f49 100644
--- a/app-emacs/all-the-icons-ivy-rich/Manifest
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -4,5 +4,5 @@ DIST all-the-icons-ivy-rich-1.8.0.tar.gz 26090 BLAKE2B ec0ccd4192007938d38dacf83
 DIST all-the-icons-ivy-rich-1.9.0.tar.gz 26428 BLAKE2B f2d23fd537921fd48ce26caac35a5ac9516ad2bffdb99c37d507ba2640179aed8c5f88361c5e9e34c2945bdb9619d2416d8c5fea55c0dd25d0fe0fe42cd5c353 SHA512 ac0c3f18d3842eb4b9c6f098e00814f421277b44c4253f9efb28c6d02e94fbb159db40cd9ade877ce218154c30210bb39dc93bfd95a7a61a71b09cbed1af5d70
 EBUILD all-the-icons-ivy-rich-1.7.1.ebuild 510 BLAKE2B 61219ac266a7f6865d20d5c66fbc8d78c08586b14109b1eef49f2ddf553050a0925b65d6022372d39637c3b1bb2f830c120864b5ccd5b3c3cf53faa8b1b34ede SHA512 5842e5090c54f27143a0c144bf3aae1440594a7be511e93098fd36266d27873ed21de1e64059172ab97c8e973763b969594403784dfba43d6132082bd897c40a
 EBUILD all-the-icons-ivy-rich-1.8.0.ebuild 509 BLAKE2B 176cea71e324aebf836d52a02fe366d20e1f308af154d66f3809c5ebb86ad7d13733553cf4fc47e22dcf4c4d0e21c6227c89d678cfced33a9454092871d9cdb7 SHA512 863c84f79ac5273fbf2a99cdf0ec3fa40109b1e20b6f81d0142039897501c5804309762f6eca623495604d9d851b7e30588eb271b521971a9159fffdebe435ea
-EBUILD all-the-icons-ivy-rich-1.9.0.ebuild 510 BLAKE2B 61219ac266a7f6865d20d5c66fbc8d78c08586b14109b1eef49f2ddf553050a0925b65d6022372d39637c3b1bb2f830c120864b5ccd5b3c3cf53faa8b1b34ede SHA512 5842e5090c54f27143a0c144bf3aae1440594a7be511e93098fd36266d27873ed21de1e64059172ab97c8e973763b969594403784dfba43d6132082bd897c40a
+EBUILD all-the-icons-ivy-rich-1.9.0.ebuild 509 BLAKE2B 176cea71e324aebf836d52a02fe366d20e1f308af154d66f3809c5ebb86ad7d13733553cf4fc47e22dcf4c4d0e21c6227c89d678cfced33a9454092871d9cdb7 SHA512 863c84f79ac5273fbf2a99cdf0ec3fa40109b1e20b6f81d0142039897501c5804309762f6eca623495604d9d851b7e30588eb271b521971a9159fffdebe435ea
 MISC metadata.xml 455 BLAKE2B 8e42e8f90284961bfa2009e40e212db1665b4624ff14b18689a32ec25361d9eefa65acc7e5b7e189d8e3b3b397eb41bfa36e672732f066a937b6bbf3fb70d5e2 SHA512 01b692b5436521b2a4e781aca48fbbee42979990521ab5b74ae6e0fa8f17725880ef9d096d77eb7dd5ebb087981c11d2d5f3736fab536c587211ffae19f784f1
diff --git a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
index 1fb9764f8aaf..35dffc4b0c4a 100644
--- a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	app-emacs/all-the-icons
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index e416fb3125b0..7898ccd68b8d 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,10 +1,10 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.28.tar.gz 87689 BLAKE2B 510741e02c5973c80f3b6d9374d179b132ead8aefddee530f9a5f2cd5e6603bcb925060e40d614ec6804bc6aa918e6dea568d47ad3295c427066ab4c4953b37e SHA512 b83f1a9e14bce6e6e63047788bfa4e34b8d958c6422a52829c8752e6af7622764021c1574f812160472de123f0cdc68edb6daa0703d3b2633e84fe7df6ddeacc
 DIST buttercup-1.29.tar.gz 87693 BLAKE2B f42b98303a058dc3435b00dc5b50eb7217cfd70b48f982cb8823401b4d603ba2292a3235077d1263ddeba69284f6d7a37e407869dd3d4357102f1e765b14bf4e SHA512 3d400dfe5020fffefa5e8b32b9d5b8191a4882d790a9c5d48267cb021ffd0d6e9256116dca0d6118e920a2a0a2902bba7a2f73504c165cad71a4fc7f9867542f
 DIST buttercup-1.30.tar.gz 91126 BLAKE2B d9024aa154d5408bb6c200099be2d8d9a96df61e421f0d602bcc4ef0350665e250362384d3cd931bdf72f74cb9d95cdd62fda3bba4171f2de764876d1716f69d SHA512 e7dd6e0823216e593943545ef0ff6ac81322a6d0317f8517d14ddc65059638ef4435539e0722c6ba340eee7c32473310af62a2341e30d43effd1d787dad6ab61
-EBUILD buttercup-1.26.ebuild 650 BLAKE2B 1fa55c63bb666144e5fb761ba0c1d5e39eec463cbb9ffc6e95c163868ac1bc7797b64cc0ba574f767534df7ee12de496c5732db3701f135121e82ff0b5860c92 SHA512 adde9e5f85d401aab81f18ebff1f99b8205cb1a007f8ab27c2374ac7ba16e7b61f8fa9defb3bd10bb39b514510b63a489002d11f8ccd8e76ab3c3036695d2cf7
+DIST buttercup-1.31.tar.gz 91816 BLAKE2B 2a2569a3750b4ebf7ffdf7a0812be322b1f71b3579e35e55de5097a221ab342808349b8cc0e5f958b855aca709fe0b1e83efd005895c52e8dcf59a25960c05e9 SHA512 b7a779b610295d4ce24e537c4a3b4fd8b23c2fa8bcbd3ca622fe96681cf294dcc9eaea082441f23efa75a13c54cc768c63bcff1e0bb8bd7d1971c75c10c21e5e
 EBUILD buttercup-1.28.ebuild 650 BLAKE2B 1fa55c63bb666144e5fb761ba0c1d5e39eec463cbb9ffc6e95c163868ac1bc7797b64cc0ba574f767534df7ee12de496c5732db3701f135121e82ff0b5860c92 SHA512 adde9e5f85d401aab81f18ebff1f99b8205cb1a007f8ab27c2374ac7ba16e7b61f8fa9defb3bd10bb39b514510b63a489002d11f8ccd8e76ab3c3036695d2cf7
 EBUILD buttercup-1.29.ebuild 650 BLAKE2B 1fa55c63bb666144e5fb761ba0c1d5e39eec463cbb9ffc6e95c163868ac1bc7797b64cc0ba574f767534df7ee12de496c5732db3701f135121e82ff0b5860c92 SHA512 adde9e5f85d401aab81f18ebff1f99b8205cb1a007f8ab27c2374ac7ba16e7b61f8fa9defb3bd10bb39b514510b63a489002d11f8ccd8e76ab3c3036695d2cf7
 EBUILD buttercup-1.30.ebuild 680 BLAKE2B 499a192b8a5208cca23eb864e1a1e9463e606f4b76a218265c795254d8e545792974124bac30a1d9a2f73d40fe41caa59cbf3f24c31c933bb24fb0c7a74ee2f2 SHA512 f56490f9bcd568f7b35acb6eaf63f0e3b02dca52a5d0f40ae17c1fb9ad83ffb84bc51e2d488a042689df8b8bb154ff9506d02c2b1d5d18dc2e4ba90d07fa3a8b
+EBUILD buttercup-1.31.ebuild 680 BLAKE2B 499a192b8a5208cca23eb864e1a1e9463e606f4b76a218265c795254d8e545792974124bac30a1d9a2f73d40fe41caa59cbf3f24c31c933bb24fb0c7a74ee2f2 SHA512 f56490f9bcd568f7b35acb6eaf63f0e3b02dca52a5d0f40ae17c1fb9ad83ffb84bc51e2d488a042689df8b8bb154ff9506d02c2b1d5d18dc2e4ba90d07fa3a8b
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.26.ebuild b/app-emacs/buttercup/buttercup-1.31.ebuild
similarity index 91%
rename from app-emacs/buttercup/buttercup-1.26.ebuild
rename to app-emacs/buttercup/buttercup-1.31.ebuild
index af9c0184e242..96cc1f27a2be 100644
--- a/app-emacs/buttercup/buttercup-1.26.ebuild
+++ b/app-emacs/buttercup/buttercup-1.31.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/emacs-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( docs/{running,writing}-tests.md  )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/citar/Manifest b/app-emacs/citar/Manifest
index 0e0b2628c4d2..1298e8e29b48 100644
--- a/app-emacs/citar/Manifest
+++ b/app-emacs/citar/Manifest
@@ -3,6 +3,6 @@ DIST citar-1.1.tar.gz 1340039 BLAKE2B b2090a35a582918300f5e4bb2188d4636309888303
 DIST citar-1.2.0.tar.gz 1417090 BLAKE2B 40673ee0f2ee5b4f86928e140714a517958d261c632ea1e7bcb3dcd3dde3a0bb9baaaa1107f50447f1d8e87485570033afbf0c652fa6b3f1fbffeda7b7df04c3 SHA512 31f817de77bc8fe9e2fdf96ac7df521ebe5685cf49a2a78cd2b1cd51e538165bde36fc8515c2fd7c20d4c6160372fdf37c1b870b12167f946c0f3934edd5fb7c
 DIST citar-1.3.1.tar.gz 1602843 BLAKE2B 0abf90120860777e13ac495681bb1e07d6c352bc17aef173b32e60fc2d754a37628670b57e17335bc5e549c451b9565a58c8547952a5b78d6335adc7601b8f5e SHA512 a00e7ff5331fa3a161151292dd4a9d3c0a7211051f5ddf528cfe7d4a48377af64f3719f57c76013b45a30082fbfd435d98196e757169970a22bb662f49ccd346
 EBUILD citar-1.1.ebuild 978 BLAKE2B 3f4cc6c8f51f24e94246a5250d3c99514fc5e42f99c467c558f68d947979f815f9aa44e416dfc70db5460eb72f7e3187cab6e2f7522d50aaab0b732045a142c8 SHA512 42de076ee5f065b4c6035fda96c51b2b51595b92a0ffaa6ade128f215344bdcaa2278ff2cb92530cb31aecbe46917557eb949732fafd17dbb4073c913d6199f7
-EBUILD citar-1.2.0.ebuild 979 BLAKE2B 8243cd6b70792fcf30ba71450389a1475cb4c5a66b794824feb4861cde560f34fc9b8fc09cb56b9ebd88baf322f9f9b296daeb8e294ee6a15ccefbb3db298774 SHA512 23566dbc5ff4ad70d61e382fbe4107295e0b1c36946d957434c92e04e8662585fe3b3f89eb09637acaea6725ad6a411a46cd3b657e66256caecbddb6356d766b
+EBUILD citar-1.2.0.ebuild 978 BLAKE2B 3f4cc6c8f51f24e94246a5250d3c99514fc5e42f99c467c558f68d947979f815f9aa44e416dfc70db5460eb72f7e3187cab6e2f7522d50aaab0b732045a142c8 SHA512 42de076ee5f065b4c6035fda96c51b2b51595b92a0ffaa6ade128f215344bdcaa2278ff2cb92530cb31aecbe46917557eb949732fafd17dbb4073c913d6199f7
 EBUILD citar-1.3.1.ebuild 971 BLAKE2B 401d427cde0abd5caa7a50fe59a818cfc754ddd19685bce5c4320b209cb3f9b59172ec725f5f66baebd47eb2d1ebcb0a1f1e8001afbe66d932c916a0dbada592 SHA512 734aa260e166a2440c1cac97cd583d8d5abae7803bb00df4383b651e13da5430a03fa8cf1824175c1e44ec27d0b994f233fd1e50dd348c1abc676f7c6b91dc4e
 MISC metadata.xml 1034 BLAKE2B 10d658566f58e3a91deab1c4d2035bcd25ee216777aa105b1e8c8853ab103add779f0f439e706496b2468a3fcb8490320ccb454d90c2e70b5b8bbe9f218773e4 SHA512 4b81115dfccc471987c63876c0b282875fe95c5738f69dfdf7a6300c37998102f2fdda829d14938871bd857fbb5d145e6c62b5b4be40b532f46245256d0be259
diff --git a/app-emacs/citar/citar-1.2.0.ebuild b/app-emacs/citar/citar-1.2.0.ebuild
index 9c62e000f5a7..ff1b374f1f92 100644
--- a/app-emacs/citar/citar-1.2.0.ebuild
+++ b/app-emacs/citar/citar-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	app-emacs/citeproc-el
diff --git a/app-emacs/doom-modeline/Manifest b/app-emacs/doom-modeline/Manifest
index ab95d7eccb96..566e33e18d73 100644
--- a/app-emacs/doom-modeline/Manifest
+++ b/app-emacs/doom-modeline/Manifest
@@ -1,4 +1,6 @@
 AUX 50doom-modeline-gentoo.el 77 BLAKE2B 0b7e10cff2a5e20083f8ba376e3e72ea1fc423cb8fa605b59cfc601aac72fe8611a6b558924c52b1f74ef2413d2efea806c929fa1d4b8b212cabbb9ef62d730f SHA512 6dc0e3ec4c48923a850466c86b97a63472e0861dcd8bfc8d346cac17e3cf1f0aa03fe0c3d9b75efaa73ec919073024320d3b4cfc17e8c1a2c0b2a17a43c72339
 DIST doom-modeline-3.3.2.tar.gz 61363 BLAKE2B 2b80748265f911954e1726dc30e6bacf4ba7ffb6eb589e8f67c366b818e212376039eb025d380937b327f7d3d4a980ec6bfe0589ac38af1e0d678a8f6038b97f SHA512 ff0b41c5f8dc7e5a4a5bccaa710b445a1894948893cd7dea6c564d3a9b1be5cd7cd005e6a28613a6800526d5158faebfef51d21b9e911d97416821210954f0b3
+DIST doom-modeline-3.4.0.tar.gz 62357 BLAKE2B d3af3875b25f9ef8d2b75e1acd4ed9c7f8e3d5ba306731f019ae076d14339c97b9f7f59bbb0806e5443c39d855aa0af9c2f9509ca93b11a9a275aa341e4d431b SHA512 1ed7c061e43fdb1e5a9fbe1cc5f87021a90796057206c64ff4f590089e0b5bd835d27f95129c92e1deb50012dc033608b071fadd294df4f102d67cb2872b8b86
 EBUILD doom-modeline-3.3.2.ebuild 684 BLAKE2B 219fe787946a1be4dcc961f1075516627361510c4f5692a6b22ef1979b60d1d366aa766b72218e84d95d776714206d3b6205fd5068f650a1b481018ee67feaae SHA512 005a0d8ce43cc80450f760c70a9ad80d401946ba4c6673af26c16f8b84017512a7686ce6ca38f75b4bf21ca4a0ec52400bc6ee20643d48b1bfdf524ab0578902
+EBUILD doom-modeline-3.4.0.ebuild 684 BLAKE2B 219fe787946a1be4dcc961f1075516627361510c4f5692a6b22ef1979b60d1d366aa766b72218e84d95d776714206d3b6205fd5068f650a1b481018ee67feaae SHA512 005a0d8ce43cc80450f760c70a9ad80d401946ba4c6673af26c16f8b84017512a7686ce6ca38f75b4bf21ca4a0ec52400bc6ee20643d48b1bfdf524ab0578902
 MISC metadata.xml 437 BLAKE2B 4510e1869b8871d0c054ec00c7c639125d52f451ffc129fe5a8255026ddd3c2fe36d8e9f5ef9a47c7f0b87b356d67e16cc2ab84b6414b7399b402df3fb0d3d89 SHA512 cda6737b5873ec737482048c543f9a5e8a8137d13072d663c8b714e0607c47c8d77ffdef9a2d9c8713c0c321c0e7bd3cd1531546f53c045000853badd575e61e
diff --git a/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild b/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
new file mode 100644
index 000000000000..6740287569c1
--- /dev/null
+++ b/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Fancy and fast mode-line for Emacs inspired by minimalism design"
+HOMEPAGE="https://seagle0128.github.io/doom-modeline/
+	https://github.com/seagle0128/doom-modeline/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/all-the-icons
+	app-emacs/compat
+	app-emacs/shrink-path
+"
+BDEPEND="${RDEPEND}"
+
+elisp-enable-tests ert test
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/marginalia/Manifest b/app-emacs/marginalia/Manifest
index 5575b7b763b5..9ec2d8435a5f 100644
--- a/app-emacs/marginalia/Manifest
+++ b/app-emacs/marginalia/Manifest
@@ -1,6 +1,8 @@
 AUX 50marginalia-gentoo.el 133 BLAKE2B 9924046f0683974aba9bf9bd0939058eab78abc131b0eebd5d2aac17c0653e0a578c062fba7a363797e6455b8bc85149e79778f8abd4185eec68dd61206b8216 SHA512 e5cd461343454dfc9de75f15e5c35337780ecbc96d844a160c3f9cfcfd5382232b4359191b382741839700224493adc6f4d3218c050c3214b49af0dc85feb135
 DIST marginalia-1.0.tar.gz 29142 BLAKE2B 99048ebca2156981aa77eb10bbd914648932bfc328f41abdda8196361542e7550895f5263b04a239fca3ef79a2cc87ff7e9a9d315ab46ef6d87846117a325cd5 SHA512 82b7220bce1d8804be9a4783518f4492d66e039a50c0fb064bbfe18acf119600a9f3c9cc2dede038b390c4522c1163ea1982e9f3f8a3f170c0f4f86ef1ec87d5
 DIST marginalia-1.1.tar.gz 30058 BLAKE2B 9d2b792383ed3c67ce1611ce0eab31edfc0769ee2243a7d8e189a398076d977b0a5db60ecd28d3ea8483a91fd27088d6b4fbbe0d9c5e16a3348b7cd7e211f05c SHA512 83cf7a4dce4a4f0064ef2a7c51beb6ced73aa4f8951d2920fbaf6f879ec5ff9431890840f2afcc0741b3cccc6842a68461ccdf51450b6b4d2877477731796be2
+DIST marginalia-1.2.tar.gz 30235 BLAKE2B 65027b482333086dc3a328741df772b5ab8435bc576c46602194c6373c812cc956a4936205b071e71453f5634b4481aa8ed8d3b08c3687788b6b92385a1cc54c SHA512 708effbeec74e0ef24f307d8a93f9d6e7b6936c343a79e72bc333520bbe0ec9d101fecf84793ef3f3b274b2c3bca88ee01d52ff37d154128a46eb774f9775c82
 EBUILD marginalia-1.0-r1.ebuild 401 BLAKE2B 4106091be05556dc81ae954f38bc97bca13012f0732806bf5dee75a0784e3b4b14cd99643cd6a7eda3465c50aa487acf41ad6f05d5137b9d237c4c15efe7f4ef SHA512 30ab05814d9cdb21b67366b94b8ea0283cc1eba1b29f758888ed4a2bb5c79f9e9015b01441998eaf5e5665b9e855ce2c724b3eebdee696c2128b20b48978fab1
 EBUILD marginalia-1.1.ebuild 461 BLAKE2B 5d4ec50528487849aaab8a76187044c8636059589294e0dbff86777bea711ed6b86349927b068e9d1190e4647cee10318ae4a7c23700741bfe4cd5c693104273 SHA512 4b05a0a6244b5be3b6852e8fafa9d444044f9e0b0de40f59a91e1234240139aa69c384383ec45a58f30d6bde2e05383eb7134b2714df6be323135a8a15328312
+EBUILD marginalia-1.2.ebuild 462 BLAKE2B b1d4682a5d9e8c5adf94890bbd216998fc140294acaff251c0c6ab9acd4a3e926e4bd80267c8201b38443c666d4fa852fd195fafed46bbc4b5ab2aa373273f6c SHA512 25532d81b6d931808b465153ba14723ad5dcdc4825e0020f71a4adf440a0020dd03df4ba17b57fa7d66b949ed0347ecba8838f5216dec6b7ef6deb72b5dc3fe7
 MISC metadata.xml 362 BLAKE2B 170d321c62f5b92b3fda03c4c6a1dc8438023211ae2f9261c997ce1300e4d24fde6588ed57ee766b2637e31c186e11aefdae58b083fd19ec15cbfe2846475bf6 SHA512 99a6cc13efa79095c0fe1bbcd2661fcd56bce0b3cfc9da0af6f90248b8e1ff27e78e0984677df5aba4c383530cc8446c5748296b35e07d6d2d81bda26b5433b4
diff --git a/app-emacs/marginalia/marginalia-1.2.ebuild b/app-emacs/marginalia/marginalia-1.2.ebuild
new file mode 100644
index 000000000000..94f2ac11d2f2
--- /dev/null
+++ b/app-emacs/marginalia/marginalia-1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Marginalia in the minibuffer"
+HOMEPAGE="https://github.com/minad/marginalia"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND=">=app-emacs/compat-29.1.4.0"
+BDEPEND="${RDEPEND}"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 60dc880107b2..64414019ea14 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -4,10 +4,12 @@ DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d13
 DIST org-mode-release_9.6.1.tar.gz 2207262 BLAKE2B 1e5880b9a3eab54e0a6f94cd630bff1ad00f58a24f0f46c203de01ee12c0ce652a8dd820b4a71c2d011d1cca55c08830cdf5e33410e2bccba95845ae05a20408 SHA512 0bf1e4879ade377276b438d7f71cfa28a75b70380db16d79fb698f7ff4f79b80684bc28a69dd23bbcd94844365a0cec36d70bd4097cc12e2b942ad6a97a5af6a
 DIST org-mode-release_9.6.2.tar.gz 2208663 BLAKE2B f76e48f058a2a32cb09c14041b6781c385e1267eb2c80e39d0c2b3432ff7555e27b21ce33e1e5e0c0a99ded31b6d3b3ed678e41ff00752f97d2feda8b0111911 SHA512 2dfbcaa8c720b628770ae3bee223c51c270220395b5d1659dc529bd60b20f7308091b565d90d53ebb9462edd6207a1652059623dc80b0bf8b2799b3beac5a2fe
 DIST org-mode-release_9.6.3.tar.gz 2208740 BLAKE2B 77d8e7de2230a3d4b5f3e85336519de1b2d55481522bedc206c5edb2cd56963f729d1e48fe483717fd4c295c6eb1b73e9335ab6a56c2903dd9ee54e15da0a8a0 SHA512 4a7040bab029c8384fa8689782672887baec7eea66ea99a32fd026eddb1659fa15e6c8ba99546fb7b8a16492d1fa476542acba3adef745079f583bd0e2b834e0
+DIST org-mode-release_9.6.4.tar.gz 2208733 BLAKE2B 4ac49b4af872750453dd29eb0fb7de75a140246defb98a1ee62b693fe5083b892eff32ffda6a87cdc4d22486c8246134bb7483e3ec335e23ee131e0f6894475d SHA512 fa117500e0618f20b55af6e7f3cee2d24bbcf396649fabc1420299d99599335c0697e865ac38e49a30d5f2cd00e6daf163f340364e51c306583a7198852df059
 EBUILD org-mode-9.4.6.ebuild 1696 BLAKE2B 1e2b698f0ba118149cd4e960e5a34b6370c878a917746ecafa9758b5f3ce24d55ea0a7ff3a99b370c972cb0c97c0321bdfe5735d5782d98adcf1ab4c65e4b84e SHA512 76bbc761a82b08a26bb73c0d655b52308487586a8a108a6bc2a29ec66816fdf1f173c626f8594198c00c6a45000686e0876b98dbeb3e566ae212b03005c90ba4
 EBUILD org-mode-9.5.5.ebuild 1386 BLAKE2B 2686e19cbcc0e8298702d9be753b8023e8736feac0d07793c581dfa51a9167d65b072a1d8a268b319b4dd87e04a6e920d400ddb13c50f3da5837bc08cc58f8a7 SHA512 b3417352a09da826becf217c2789d90b25971c4d97ff92225459b50617c04f85bb1cdf53b933ba1c5927a202a4852acf6bb1b6bee3e2c2c40a3fb772669017fb
 EBUILD org-mode-9.6.1.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.2.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9.6.3.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
+EBUILD org-mode-9.6.4.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9999.ebuild 1531 BLAKE2B 6c06454ac286f2d681af7e55c151a9855dac8aa3028c41c43753ee907fe4d63ec26e5e8e4a0a4f97b80172b0f8fabc92ba591298bef9b5301a176460a1ce9358 SHA512 5526252d6a1190a8bee375b96e9b85c33e593f6bc77f118a33cd566c8fc5634e9e839dbe931c9ad96252e81d669fdc84f9999ea6b834cf2273d31d1e8cb86d90
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.4.ebuild b/app-emacs/org-mode/org-mode-9.6.4.ebuild
new file mode 100644
index 000000000000..77e4614e18c6
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake -j1 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/osm/Manifest b/app-emacs/osm/Manifest
index 4948ff8037a3..3812b45aff06 100644
--- a/app-emacs/osm/Manifest
+++ b/app-emacs/osm/Manifest
@@ -1,6 +1,6 @@
 AUX 50osm-gentoo.el 67 BLAKE2B 0486bd17d60abb53433943335ed7584a0ab6f3b2a1dcdf23174e6f790f95044d4000d5b37a3b1c2549337268b5b296c6528e68e061ad75aaae8bf3ff141069f8 SHA512 b4aed2a5c285c94489371fa297a44d7bd3ac6172199cea0218d0469cf4c2d36b819ada8f3da6b0a95c44f729e4d77f5051826081137c0f68cd58829705ccc50e
 DIST osm-0.10.tar.gz 31628 BLAKE2B 6cb3d4fcee65b93787507fcdc15afce521e4d65c2fcea9f729e5292bfc57ec065604c8439bc5d0d744969c36fcba14204257a93546d1c67a9d3d8a816e26e9e7 SHA512 03ad03b9b64244c53c2b9a7329b9d741f33102e41684488385bdc60e5398b9cba7d3950cb0937b4bdecb93017cb2c1b5f99324195349b88ae7eed66431149ba6
-DIST osm-0.9.tar.gz 31248 BLAKE2B ac9bc39ad42046bbec408006a375ad5bda2f561ed5fec7c489c5448ec9f4867ee2d3a7aeecfafbcf078cb4f4780c0e43442e7fa7c7fbe03755835bd56b9312e1 SHA512 4fe88be3bf99175cab4f90d516ef99e3ee7e5209d0046675c92f29a4786fccd92470560771fcfd8887e214b776fac9b75cdd8a0334d2de2d6b42d4313cacd4bd
+DIST osm-0.11.tar.gz 31935 BLAKE2B d4cb18a9ab17d0d982db94a1dcfb37bdf3676b2b6bf367f249ccc2475783ce4f7eda8bb01beff8ac59e4a963e7800402f3fe9a99832f9072396d679a4fa0bd56 SHA512 02faba5200897b78b1e8d616d3f21a607645e401b80e13d016be8317cc92dcd7458d6b968066f088d9ee202d477e183c9d93bf1475710f6a6c249608cb68b0d6
 EBUILD osm-0.10.ebuild 635 BLAKE2B 98fe641c58a7e01e861a758b75af7d9df906041c3096e67524b74c679ac7e12ad548c7f54e085a11170e65c70df75708c393b48e7459b6ce1cbd32484da3e205 SHA512 4132aa4bc72dd883460d18ea87378c64a9e3a61558019068a68374325d1d20487298860852460f608f3e6ad3647922086d108dc1257614fd60f779b8d5585c91
-EBUILD osm-0.9.ebuild 604 BLAKE2B 1c5b2dbf4481468c23adf3addbaaa8718a1901a3175d7fe757e9e692c72dd3ccb2c70b63e56620af79e1e141bdb658e2bf594dbe1cd5080b2f9a98be0a0867f8 SHA512 9e2559aed8d570436846efde8b1286cbcc5a90414a98f66fc37cf7be541420d852c4a0a38c1655f62adf1880a5929e32005f511a0877bd946803208749d3e4c7
+EBUILD osm-0.11.ebuild 636 BLAKE2B 773651dc9598026f6d284d8c6279a07a4a4c04f1b2e868738c99347fc862b05a2b5ba399addd73e8c4e6f56e81a4269cf6509e36aaa5f95be360a33b65c42ed3 SHA512 73b3c7f698520c5fbdd91b12e6b08c277176cf9043100c11851cff9a2d29975987e09aaf3244d079326050f3a1d4b58c0848e353d55377c1f34da2c9805a4d7e
 MISC metadata.xml 1007 BLAKE2B f28de509f2c4d32cbc67695ed97d2e4231baaa56e29a55993bb6b6c85323bbab51ba6ea398d6b0f562cb93975c6c09a5962f7f504509c4a6dcf19a6efca08750 SHA512 8ea20302c01493f320e2ad72e2a3530088a9a7d8db5a72c33286f31e82ba4a60e1dcaf6c4a11ded416ad864c27bb42d3833aeda58b261ea054ab71cb5fd26736
diff --git a/app-emacs/osm/osm-0.9.ebuild b/app-emacs/osm/osm-0.11.ebuild
similarity index 83%
rename from app-emacs/osm/osm-0.9.ebuild
rename to app-emacs/osm/osm-0.11.ebuild
index a96d34a47bb3..e10c84ef5e7f 100644
--- a/app-emacs/osm/osm-0.9.ebuild
+++ b/app-emacs/osm/osm-0.11.ebuild
@@ -16,7 +16,10 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BDEPEND=">=app-editors/emacs-${NEED_EMACS}:*[jpeg,json,libxml2,png,svg]"
+BDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}:*[jpeg,json,libxml2,png,svg]
+	>=app-emacs/compat-29.1.4.0
+"
 RDEPEND="
 	${BDEPEND}
 	net-misc/curl[ssl]
diff --git a/app-emacs/projectile/Manifest b/app-emacs/projectile/Manifest
index 049b4fc7f037..7d7c7ac4befc 100644
--- a/app-emacs/projectile/Manifest
+++ b/app-emacs/projectile/Manifest
@@ -2,7 +2,7 @@ AUX 50projectile-gentoo.el 141 BLAKE2B e56b9486e81ed169662cb21ca2a19f43b96701b77
 DIST projectile-2.5.0.tar.gz 1915860 BLAKE2B 4d215e2c1e44c7f85121fc36445112f3064129fe95866b4fbb2e14b11d31519057d9cc69bcdf44c82cd516768cc73a031da48a7c5352b9825816db54810cafcb SHA512 3faeb7db70e5e2198ad307c1d5d24a5fadd207765387e7094691e40071411506e6df690995f923bf246b7176173ca41882d369276862b631d7436747bfeae3a3
 DIST projectile-2.6.0.tar.gz 1922935 BLAKE2B 40e5fc3d152b4fa244bb42cd606d4d6c92e9a212a3d58b7e5e3b333a6b9eb07ca05d61c18aa1859ba5e99872c92f2b8ae11442e5ebda22b057cb49017b1deff8 SHA512 28898d8e48c1dc90ada0f3648e8ef96bff96a3873af61d7f454160fa9fb5f2e8b08c7e0ab99953170b252a29bc04ccb3c10803807b0b96cfcead167855642fed
 DIST projectile-2.7.0.tar.gz 1926804 BLAKE2B 2dc52883335dda0bb6b5d9bf606cf56ee38730c2d14ddca5a8e5fac1169b9ae91f8c264d7f1d0a311bea21690ad292194f9b2bdab7d4dc2b03abafda706a67bc SHA512 bdd4484b916f59434f33bfc6eb663bb75ba6196b632894f27a46f90ea75f0268eb847142c9ff97386ca9ae6a2dc2fa6f26b20b34e2f3d00c80674784a32d10f8
-EBUILD projectile-2.5.0-r1.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
-EBUILD projectile-2.6.0.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
-EBUILD projectile-2.7.0.ebuild 632 BLAKE2B e2eb2aff7145a90c26b8f75980820b524c82bcdebba00f480062ec64944169b32022fa17bf122e3de5cfed44ee8fb079dd390cf8d75aef4fdaa9419495feec23 SHA512 63e99fca3a2a32f62b11fb36e65fbac031cd8bdc88fd387e3b6658ae466e2d78b19d27952b9b010f9f92c50c7e3daaa5ffc9ba5851a916ccd16b3e8fa22ba0d2
+EBUILD projectile-2.5.0-r1.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
+EBUILD projectile-2.6.0.ebuild 583 BLAKE2B b3ac5979e3893823fdb1b3ae129ba7394cc58588c39f10666d81ec984d5dabebcbc6152858e261399b40b460f747e9d185aa9774fe0b92ce4a4ad388539d36dd SHA512 79c51a8472f6d9819612c784f44fdc0490098f803afd5216ca453a292cb64a2a0331ea1224ff04bc5890e82d2ec081bfffb078c0d92d2271146c5a8a2b088286
+EBUILD projectile-2.7.0.ebuild 599 BLAKE2B ac113fa2e8c0c831441c61a4440cc5ba31c09d02ea81506b9d40415ecc952fefbc46b2e5ae6ee9f0655c9ef70cd648a9110d7eaaeec2b28c90e97e3f70b4a25f SHA512 1e3c49c62947c9cc58d2dcfdd607d0c498dbfeb13998bc77d6ac10b26b093f2ec7a01354812ed5476a630118fee2ea4d0efb99d46f3e8624ace2b9851c60ab2a
 MISC metadata.xml 730 BLAKE2B 026ad65ade8e08d1874db2ff46be522a975ae4f1c81a04510e46912bdf7ff171e5523c48b863a5d2cfee3818ec28d0dd82aa135de272b60923d200396a09ac44 SHA512 81f9d1c00773d81a5c680e3ee57455b92d85e0e136d5a8125418e419f07c91a6c16cc5e899f995c5610904a605a03aa405f319fc4f5399df5e9b7942a68c1bcd
diff --git a/app-emacs/projectile/projectile-2.5.0-r1.ebuild b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
index f1dc336ca4fe..4e3c229ebadd 100644
--- a/app-emacs/projectile/projectile-2.5.0-r1.ebuild
+++ b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/projectile/projectile-2.6.0.ebuild b/app-emacs/projectile/projectile-2.6.0.ebuild
index f1dc336ca4fe..4e3c229ebadd 100644
--- a/app-emacs/projectile/projectile-2.6.0.ebuild
+++ b/app-emacs/projectile/projectile-2.6.0.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/projectile/projectile-2.7.0.ebuild b/app-emacs/projectile/projectile-2.7.0.ebuild
index f1dc336ca4fe..6f2aa04e7217 100644
--- a/app-emacs/projectile/projectile-2.7.0.ebuild
+++ b/app-emacs/projectile/projectile-2.7.0.ebuild
@@ -6,21 +6,22 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
 
+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
diff --git a/app-emacs/shrink-path/Manifest b/app-emacs/shrink-path/Manifest
index b28cea595c94..b89d6ff95e26 100644
--- a/app-emacs/shrink-path/Manifest
+++ b/app-emacs/shrink-path/Manifest
@@ -1,4 +1,4 @@
 AUX 50shrink-path-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST shrink-path.el-v0.3.1.tar.bz2 15743 BLAKE2B 8f5db089737f2d31c9f5852265f1b33679de3cc72989bf04b8d50871b3b8fa356da6823177759561b99ee5b032fb10ba1c51f49cdd7d74daafb1d6cac44ba2b7 SHA512 f4cc191186c2a2e706ff08fbcd43f24dd67297a368c42da72626d70e3522d5b24ceba45a2e17821f6288576f10e0208e3d643946108edd6180502dd1bad019ed
-EBUILD shrink-path-0.3.1.ebuild 807 BLAKE2B 5eaf0c7e143a4be9461323872f58dd65d860bee34f4fea69f0a287b34d0f556f5244e4d79d3df402baabe869e42cc790024edbd067fc58ff314036b7d2cac8d9 SHA512 81efbd89ae887678d8165c07aef4cbddc6dd201eadabf266795579c068702877ebf87c73023930c4eeb8ee234a3d4ca4b71d9451fc2d2db76c6f37e239705b53
+EBUILD shrink-path-0.3.1.ebuild 700 BLAKE2B dc2bc050b1ecf02c52eb9e9f41f19f04c7c7fe884f7350f203d8be3e5f445e696ae2911f527c8d7bab8c35f55278e10a0dc25e9fd016b307ce913597c3c3458d SHA512 f3b807b757248dd7982b96d7969618a218cac6d0c579121311a57c8e70bedce2aafe7d8d5fd89515071af995c708e76a5db751797020c6e5a0d1956ab192c96d
 MISC metadata.xml 433 BLAKE2B eaf63f4513651f57d6e4a5032a2f244011234c6fd995939ed294ed8ceefc75487664cd769ed64eaf82b6040bbddecfb4f85ffc907a5103febf53cb605afd9a40 SHA512 65fcabbc6edff9aa6580630195a5ed911046fce5b61371881ccc4c7f19645c592f236a2ea06bd07469c3b47034e3639d0b4e450d4660a3eac0f7cf6750fee317
diff --git a/app-emacs/shrink-path/shrink-path-0.3.1.ebuild b/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
index c855273dc798..519ca144af61 100644
--- a/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
+++ b/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
@@ -13,29 +13,22 @@ S="${WORKDIR}"/${PN}.el-v${PV}
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-emacs/s
 	app-emacs/dash
 	app-emacs/f
 "
-BDEPEND="
-	${RDEPEND}
-	test? ( app-emacs/buttercup )
-"
+BDEPEND="${RDEPEND}"
 
 DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"
 
+elisp-enable-tests buttercup test
+
 src_prepare() {
 	sed -i 's|it "same as shrink-path"|xit "same as shrink-path"|' \
 		"${S}"/test/shrink-path-test.el || die
 
 	default
 }
-
-src_test() {
-	buttercup -L . -L test --traceback full test || die
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 347497ecc06e..8e7f6f0e05b7 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-hypervisor/Manifest b/app-emulation/cloud-hypervisor/Manifest
new file mode 100644
index 000000000000..cb1d2e8fe813
--- /dev/null
+++ b/app-emulation/cloud-hypervisor/Manifest
@@ -0,0 +1,6 @@
+AUX cloud-hypervisor-31.0-vendor-config 1332 BLAKE2B cdc83cdeaca82d4a40ad9af4733a4fd6fdf397e45c16b6df0e5e16b42dfe758c1ac3228c15cde74f7acd0de2a465c5bcf0e46f998a8be71264092e2000075d0d SHA512 88fad8d8237185d93a38d69f979cb16c51cd5e61a1a0bb213effcd529772166255213ee9cf04f7908c279f15bea58146deea6395673ad808421204337abb0a2d
+DIST cloud-hypervisor-31.0-vendor.tar.gz 36783838 BLAKE2B 6087223f6cf17954bbe81a792233e735672da97e7b83515ce705b6b789afefcdee1d5a6c3a8f9aded27fd842eab0d1c31b1d09c0e56391ba4422ae4360befd5d SHA512 3595445a765a3571fe3597488940f7fa01576063de2324aa7a212f69b09b9fb0163ff922e3f789696702626ca51df4512fe9e60fe0cd59c3ea191c421718bf4f
+DIST cloud-hypervisor-31.0.tar.gz 849675 BLAKE2B b88f1cb53fde6085c33e969d508fbccf29d54e2f04cee143340d0a43547a967d7cdea6bc880c24c84e34bfc4a4d8c4e4478aeb54e858d4518e528f07b521b9b3 SHA512 9ddb8bce534331f609d00703e1c47e4359723432661aef4e0b920f8b289f13c9fda68d0f3320bcbc80824f699df1e456375b6268355c8a79d69c78e5d7659f52
+EBUILD cloud-hypervisor-31.0.ebuild 1256 BLAKE2B 95ab626a6851bc599660c733a75fdddc0afc42264daf7f2b77c402038913d4fb63528adf7a0f7d57d44f7d03257886dc04a7dfecec38790f7790ee36b39f824a SHA512 2aa7c8f6c67dafd7c342c217fe86729a042f891b112dfee19aa66345139a49dc5cffb644ddd0f85a3ec5857b3bbb3b26e9c4a3dcf36036abfc97074559d50c0a
+EBUILD cloud-hypervisor-9999.ebuild 999 BLAKE2B 931a09611aa0b2d9f1e5f28e6e2aa641085f605719e8b0f046973071bf57192dce33ee86191030d636a90d4771fc88f4fa3681d937496d1cb0ce1c7eb9914b67 SHA512 ffffa5bffb4571e97aafa7c2979718877da3f493ebf74e8c181f99096f41e38745f2c908c6235826228e3859724aa1f4de831cf884aa371249abd5abefbd9ee1
+MISC metadata.xml 346 BLAKE2B 9a39588fe219da828289af5f825fc11bef3bfa4a487febcf80f076db6401b5cbd0a511b434f8e12e4144a8ddc42287e5ef3c0d0a91822d504db0e98cbee190e4 SHA512 a9ab1d7c4ca598a74d39a13fa5a59cdd1f554d82ed0a4bc1422ef4ecb67ce5002846d902da6620567eaa83ff5ef03b75956675818b93dc71988bc523c62b33e0
diff --git a/app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild b/app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild
new file mode 100644
index 000000000000..6de65cf5be66
--- /dev/null
+++ b/app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+CRATES=" "
+inherit cargo
+
+DESCRIPTION="Open source Virtual Machine Monitor (VMM) that runs on top of KVM"
+HOMEPAGE="https://www.cloudhypervisor.org"
+SRC_URI="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~jsmolic/distfiles/${P}-vendor.tar.gz"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+	cargo_src_unpack
+	mkdir  "${S}"/{vendor,.cargo} || die
+	ln -s "${WORKDIR}/vendor/"* "${S}"/vendor || die
+	cp "${FILESDIR}"/${P}-vendor-config "${S}"/.cargo/config.toml || die
+}
+
+src_prepare() {
+	default
+	sed -i 's/strip = true/strip = false/' Cargo.toml || die
+}
+
+src_configure() {
+	cargo_gen_config
+	cargo_src_configure --frozen
+}
+
+src_test() {
+	# Intergration tests require root
+	# https://github.com/cloud-hypervisor/cloud-hypervisor/issues/5388
+	cargo_src_test --bins
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r docs
+}
diff --git a/app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild b/app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild
new file mode 100644
index 000000000000..2769f9c4605b
--- /dev/null
+++ b/app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+inherit cargo git-r3
+
+DESCRIPTION="Open source Virtual Machine Monitor (VMM) that runs on top of KVM"
+HOMEPAGE="https://www.cloudhypervisor.org"
+EGIT_REPO_URI="https://github.com/cloud-hypervisor/cloud-hypervisor.git"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+	git-r3_src_unpack
+	cargo_live_src_unpack
+}
+
+src_prepare() {
+	default
+	sed -i 's/strip = true/strip = false/' Cargo.toml || die
+}
+
+src_configure() {
+	cargo_gen_config
+	cargo_src_configure --frozen
+}
+
+src_test() {
+	# Integration tests require root
+	# https://github.com/cloud-hypervisor/cloud-hypervisor/issues/5388
+	cargo_src_test --bins
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r docs
+}
diff --git a/app-emulation/cloud-hypervisor/files/cloud-hypervisor-31.0-vendor-config b/app-emulation/cloud-hypervisor/files/cloud-hypervisor-31.0-vendor-config
new file mode 100644
index 000000000000..b20bf67b611d
--- /dev/null
+++ b/app-emulation/cloud-hypervisor/files/cloud-hypervisor-31.0-vendor-config
@@ -0,0 +1,45 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/cloud-hypervisor/kvm-bindings"]
+git = "https://github.com/cloud-hypervisor/kvm-bindings"
+branch = "ch-v0.6.0-tdx"
+replace-with = "vendored-sources"
+
+[source."https://github.com/cloud-hypervisor/versionize_derive"]
+git = "https://github.com/cloud-hypervisor/versionize_derive"
+branch = "ch"
+replace-with = "vendored-sources"
+
+[source."https://github.com/firecracker-microvm/micro-http"]
+git = "https://github.com/firecracker-microvm/micro-http"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/acpi_tables"]
+git = "https://github.com/rust-vmm/acpi_tables"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/mshv"]
+git = "https://github.com/rust-vmm/mshv"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vfio"]
+git = "https://github.com/rust-vmm/vfio"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vfio-user"]
+git = "https://github.com/rust-vmm/vfio-user"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vm-fdt"]
+git = "https://github.com/rust-vmm/vm-fdt"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
diff --git a/app-emulation/cloud-hypervisor/metadata.xml b/app-emulation/cloud-hypervisor/metadata.xml
new file mode 100644
index 000000000000..81242aa0ae84
--- /dev/null
+++ b/app-emulation/cloud-hypervisor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cloud-hypervisor/cloud-hypervisor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 9b0e7c51391e..83e20c4334b1 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,5 +1,7 @@
 DIST install-crossover-22.0.1.bin 334913889 BLAKE2B e30c14b14adb0db4bb0b8e840aed89f82f59fc918ba697f8cdd86eea330b60d81020ec9ad498a511858de6fae10d74fcf572753295536cbbb98e067496029bb4 SHA512 825f1eeb10efcbf3bff0e4e6f91c709d3bbecdb5635839b580c79ff77e54333db4a84e9e6abfd08a0ea4e57729c4489e149366d5a5c7da6773a5a0d413905d48
 DIST install-crossover-22.1.0.bin 335571332 BLAKE2B 72ea09886a927eadaf6dead1d711723990e27cb845d514007d3433c9924e289ff3465a4dfdc02458e20cbcdba598ba65cea37453a0c16e3b13d790480bcaf9d3 SHA512 4de0eda5bbb68d8a5adde652c1254325a8a454eb1d2f7a84289b6d90373d7534b0821b706db08cef92c74b4286b6cceae0fc8033acccd276af5734579bad7fed
+DIST install-crossover-22.1.1.bin 335606941 BLAKE2B 3c5eada7190283f348348ef4d3b044db8e24e0dc3588d847854feb712d39bc9013e4f958a80c3f46e84b32f6b5c7d419ef6ab4fa1e946d308ba546140fb95504 SHA512 54bb40941baea184aa824c371a2eb73cdda26fa7c0765e242384e2c29a78f6b600c7455640b9888fd28ad482bf14f53a0308cbd55d9453f76d6eeb75cf0abfc7
 EBUILD crossover-bin-22.0.1-r1.ebuild 7225 BLAKE2B b59960542fc734a229ad86928d467e57a3dc1b434b6478f2c2bff9ce99bd5e7d34ef85eb77cfe72510a6ca0f3e7e986843ecb900e43047ef7416b01928482f82 SHA512 a06b29287d32142b42e6061176bff67f6b1220c8c3f8afb8eff3e91c9ac778f455b166ac83748506dbf07ce046d7e637f178ae35ad92c675f0af7aa78b7d37da
 EBUILD crossover-bin-22.1.0.ebuild 7185 BLAKE2B 627c6a19fd865d883de8803ec4a69c270455857861d1f19495fb871d01480fc4160c6a21ec50094f9f18e069518bc975382417e5eca307ac98de52e15ec862ad SHA512 fe114e9e40bec844991bf3e3b5679f3388c19fff361c892e1949f5c73e8b04e0d4725b915f31327def6fec525179560dd50c52f0271280c700bab85cd7491e6a
+EBUILD crossover-bin-22.1.1.ebuild 6557 BLAKE2B 391fa6ba87db9a8a0593e26c6f1cd2333f84ac051a84be6d40595c5d2ae7586535bf8d49fd0977aa1aadce41e6bfbb983bc8839ac34a54b6cef42b710a9bef7c SHA512 bf995495c1ad7b3208deba0c0f5aa1a33451a3b257bc9aa705377da48b423370e76357474703aa774ff47e30d6f9fc8bc5b5b6857400c7a31da7407ec2162f6c
 MISC metadata.xml 572 BLAKE2B 1e9251d49ed2cef6268dfe365e55aa7fbc537f873b00ef3dc564854db641f2744ee0e24768dede7749ac8fef82483ebbaee68fad62aeae519a98e260a3e1c1db SHA512 8aad4800177b522c0b5c451712e857ba4b532a59d63d7c807664d88e62e20c95a91a8a34cca8067cb89e433306f926315c726762ee50e72314c30344792125ce
diff --git a/app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild b/app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild
new file mode 100644
index 000000000000..c1ca3fdd5707
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support"
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="bindist test"
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	app-arch/unzip
+	dev-lang/perl
+	dev-util/bbe
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	!prefix? ( sys-libs/glibc )
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[abi_x86_32(-)]
+		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
+		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
+	)
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	|| (
+		dev-libs/openssl-compat:1.1.1
+		=dev-libs/openssl-1.1.1*
+	)
+	dev-util/desktop-file-utils
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-),osmesa?]
+	media-libs/tiff-compat:4[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/libunwind[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/vte:2.91[introspection]
+	sys-libs/libxcrypt[compat]
+"
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	# Remove unnecessary files, license.txt file kept as it's used by
+	# multiple files (apart of the menu to show the license)
+	rm -r guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm" || die
+
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Disable auto-update
+	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Drop Uninstall menus
+	rm "${ED}/usr/share/applications/"*"Uninstall"* \
+		|| die "Could not remove uninstall menus"
+
+	# Fix PATHs
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}::" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+
+	# Workaround missing libs
+	#
+	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
+	# https://bugs.gentoo.org/721108
+	if use pcap; then
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" >tmp || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" >tmp64 || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" || die
+		mv tmp64 "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" || die
+	fi
+
+	# Remove libs that link to openldap
+	if ! use ldap; then
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/wldap32.so
+	fi
+
+	# Remove libs that link to opencl
+	if ! use opencl; then
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/opencl.so || die
+	fi
+}
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 96ff8559ef42..b8499e6f1d45 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,3 +1,4 @@
+AUX dxvk-1.10.3-gcc13.patch 398 BLAKE2B 48b1f18b8368a7dccdd479df8c37b6667fe918f4c47846e0c9e7bb5f04746fbb773decabd905a4877e1bea42ab9af88d042f667272969e0bda7d44f215d78938 SHA512 e3b84263641c3abb34c31721b29eaa314f02bbd15e1ee5b3e3cefd51f57f9123b2cbb32174ed1806dcb03994ee3db8df3282d5f4791d8f1188c09f7c55cbf113
 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
 DIST dxvk-2.0.tar.gz 943397 BLAKE2B 7d59050e8ac3f9be311d11323cc0057d84c3b730360fe9e064ff4a5e2db5bffea5bae3214da366c60295ec5f1577ab08e2776274c9aaff7a7de1b9f2cefa836a SHA512 98537bdec2b5e4f2ead5b93ab49db717e0706fe771a82a6ef1e5b5792c1bdd3f417cd6b6b2deadb1397b8a0740445fa88b9fb6c1f73510cc5c0e7ae35d65bcac
 DIST dxvk-2.1.tar.gz 960078 BLAKE2B ad8ea7eb000237914d9116a8fbfde13fde3dc00d428ebfe41aacb9373c6509112545ef1942b4cbc96a18338c3d07c2c494d0454236721e220ee5f5731a5c27b9 SHA512 10d919ba2612f665a20f7c72605967adeea94d8414bee45878f9df42ad263fa5ebfc7a76319173dce054ffe9b9cdc919ff7a136042f3f4e64142844c943bdef7
@@ -6,9 +7,9 @@ DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B af76ccd3c40bc953008bc
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60 SHA512 5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8 SHA512 69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
-EBUILD dxvk-1.10.3.ebuild 4386 BLAKE2B c2cd3106bd5437f1ee18f6f1977573f48eedc1258fb0de6ac5ad0a730ce348655404a931fc1f8c90254f0c6eb29cf08f89cd78529a7785db2f9dad00345a7ab7 SHA512 3828dcb3ac3b97449bf87f5a978b5baa3c06cb9141ddee96f538dfacf7201e33eda11468f3d39cbb318f92f544f8d2a8f96f923868d12e8174105293af3b1706
-EBUILD dxvk-2.0.ebuild 5263 BLAKE2B 78de2ed9dc6540673f0b05d92f847670979f02adfd03dfa8df28e108b78788b7c8890e37eeca1e1ec3750604fb95e645e84ec99c593d11b39a5ef51c2f3530c0 SHA512 83ceafb6670947a56ae0ecb6ad208d0ed9b91db6a2f00ba868edeffef0064fe85e7a5b7e13d5b5cf4b69228deefccfb470e9eb7868002ed6e9a93ffb36861cd9
-EBUILD dxvk-2.1.ebuild 6059 BLAKE2B 7e37e822aed0352f7001cff7f554ec81bcdf11b93b9defb7b24ee24b590b75e625c4ddb254f5e025c133f1271b150108f26ec151f2b37dcbd636534a9d687028 SHA512 93a9b0ca7a914f384838b52cf66cd0ea9d05354035c88a241f8892ea5c2a3158099f958c3792427a68548d014fcf3d80236b4b0ee86c9dee25de126d3a5f829d
-EBUILD dxvk-2.1_p20230207.ebuild 6186 BLAKE2B 07fb6c7a43c659cd25d037e94ed9eae5e0861ee9659a2af1e6550ff4d94ed609ed0e362db3c228538a46c46f5ed112a908f08c1367716c17578e8c3cf2025083 SHA512 7aa809e685f2534ce116c8aa657822e962aaa4ba6a09ef941c340b80415b75d08d029dc1b30067309f36d6adf201e7f38aa539b010f0e54bee5a62fe1921101a
+EBUILD dxvk-1.10.3.ebuild 4444 BLAKE2B e61ecb0fea37a499e9967902b25baa9b9e1b3f98be9e43bbd2828c14ea8d005f4029f697fe90b4bc71c151d62cb7ab507bf903844a7d7ced8e529863aa29fa34 SHA512 73eabad530dcf9e322dcd18b8dc23b5acd82627201947ac6e76df7c42b159bb658775d679259e94b4d9479e13b0e0c2bd3bf953d5d195a9e995f5f5da407e1d4
+EBUILD dxvk-2.0.ebuild 5321 BLAKE2B 04ab5443db73e4f9c3b15787a133d76364119253c834ae6d56c58f5f13118b1b6d2d3bdd346140d08259648179ff01c4da9f9a02bce2f3ae4aeaa0fe1ee388eb SHA512 5d0090ae388e9a0fda34bdbacf8b733c7ed8ac2c99aa5a9a0cc9a1dc353dd8e2019fbd3f927144168625650010ba8ee95f92f3d64e0301e62d21f672599dfe39
+EBUILD dxvk-2.1.ebuild 6112 BLAKE2B 8a0232d60f08a86287d16375eb1e3eacd68c9075dd1e239d22f318f5e25b3de164d3aeea47acd6fa25a47011d5f0758381a3bb23cded69323dc84d72493c580d SHA512 f2b9545b9d9b2899d058b7c797db254472aca2063ba009f6d8bbfc3775912088321b834761754b96b18feb9793cfcb4bd59450b468dbbe934c47e4a382d7a8ff
+EBUILD dxvk-2.1_p20230207.ebuild 6239 BLAKE2B 4aee6adff997d157b8521cfa04416aec9c5a0954e6a4157cbb6c3dbe24783cc11d608167dc83d9ba56649e922c4461183f239f1d498336dedf92f99bfed2a075 SHA512 8c6a296d3b8091be57344bc97bf802c812c5b4bdb4d0d2b2f8c1e5a37ea32e6ee57c8d292c8fb6b465051162ab9557ae2c7ec6f0e917fea3b4e82214f5b13eef
 EBUILD dxvk-9999.ebuild 6061 BLAKE2B a58c90e467fdd6e263eb9369e1d862a1e2ed9085c26a0c7f59bc9a58cf81296461a3ff68053aae688b74ba19f5933c18fe516411d3609b0efb75e93db0dbf18e SHA512 53e623a745aa6e5e8f46a1b230aa53f22d3bdb56dbe941e642c1ee5b449314a417dbc3d618c02a68753b400381e201e8aa106c1eb3ddc18b234d4cad788de3b3
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-1.10.3.ebuild b/app-emulation/dxvk/dxvk-1.10.3.ebuild
index 0f86f1f04e95..3995d9ee33e0 100644
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,6 +32,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild b/app-emulation/dxvk/dxvk-2.0.ebuild
index 4511ec137b34..48c2560d3808 100644
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ b/app-emulation/dxvk/dxvk-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild b/app-emulation/dxvk/dxvk-2.1.ebuild
index e807643ef746..d58b78a8f0ef 100644
--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
index 8f164958b449..24b2a3ad1e50 100644
--- a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
@@ -50,6 +50,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch b/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
new file mode 100644
index 000000000000..580e412fcd6e
--- /dev/null
+++ b/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
@@ -0,0 +1,17 @@
+https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a
+--- a/src/util/config/config.h
++++ b/src/util/config/config.h
+@@ -1,4 +1,5 @@
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+--- a/src/util/util_bit.h
++++ b/src/util/util_bit.h
+@@ -17,4 +17,5 @@
+ #include "util_math.h"
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <iterator>
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index b34bde03d67d..8551cef70c23 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -7,8 +7,10 @@ AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cf
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-1c.tar.gz 48204851 BLAKE2B 5a746cf4d10e605ce30e93a5116e73c4ae893a6ccb105984afa3e65e0ec64780ca58462fe5fc89e51aef0499fdc52be9756254878d8f7f28160a1cf4ed0ee3a9 SHA512 67dbd73287409aaecd5cfab29f79ddf455bbbd25e79289c66828bd4f0fac3003e68afe3e65ea39e18e2390b825342a52285c4be1368928606628b72a274b5456
+DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d807777fcd01c101199f922d SHA512 4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7
 EBUILD wine-proton-7.0.5.ebuild 10514 BLAKE2B 598b8593b601dbcc4d23c888cfe849f8fd62e225a718a0f9436748a673871900a58f119244766f706aa45c5d7373f691969f550ffb81cd0f01de475d01f817d1 SHA512 a61e86c1cf0d180512da2e07b4bdc029307d760dee138bb90d747852be92c1cd98a9552824a651e646d3322d810ae80f0dbcc8f72fb840c669b5a073cc167f62
 EBUILD wine-proton-7.0.6.ebuild 10519 BLAKE2B 4f3009aa1c1bc54dfacc9a264b9ff411dc402c4964ffda280563626d757ba4fc56f83da1019b414a2590b3d9c159fccc656079786c7af16d2c35d8b7ce6ab0ab SHA512 ea934f2f71e7054bb52861453da351e81b7272aab09caf617162ca0f23aa90e6b0003daa5b9ec01caa735207f18d0cb75643b912b8d9209bbd0c141aa6716778
 EBUILD wine-proton-7.0.9999.ebuild 10519 BLAKE2B 4f3009aa1c1bc54dfacc9a264b9ff411dc402c4964ffda280563626d757ba4fc56f83da1019b414a2590b3d9c159fccc656079786c7af16d2c35d8b7ce6ab0ab SHA512 ea934f2f71e7054bb52861453da351e81b7272aab09caf617162ca0f23aa90e6b0003daa5b9ec01caa735207f18d0cb75643b912b8d9209bbd0c141aa6716778
 EBUILD wine-proton-8.0.1c.ebuild 10571 BLAKE2B 61318d905fc5fae990c115d14ff130cd49c34347d19c3c000889b5f6caab1a3b71295c3f2dbbeba9d316bcc1b6c1d22cbb2df8b5254868d37f53ee67967d8556 SHA512 5ef719ed250cb85a95072b0f9bbdb2c0daab41180a3a86aaab109ec66bb6aa1265a5bd97aeec3072704b2b95e1c30f5e152aa4e3f61d271794284e8c029e8ace
+EBUILD wine-proton-8.0.1d.ebuild 10571 BLAKE2B 61318d905fc5fae990c115d14ff130cd49c34347d19c3c000889b5f6caab1a3b71295c3f2dbbeba9d316bcc1b6c1d22cbb2df8b5254868d37f53ee67967d8556 SHA512 5ef719ed250cb85a95072b0f9bbdb2c0daab41180a3a86aaab109ec66bb6aa1265a5bd97aeec3072704b2b95e1c30f5e152aa4e3f61d271794284e8c029e8ace
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
new file mode 100644
index 000000000000..e514971ce399
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
@@ -0,0 +1,329 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools flag-o-matic multilib multilib-build python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
+	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+	perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l
+	+xcomposite xinerama"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? (
+		dev-libs/gmp:=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:=[${MULTILIB_USEDEP}]
+	)
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900332)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-musl.patch
+	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# similarly to staging, append to `wine --version` for identification
+	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		# upstream (Valve) doesn't really support misc configurations (e.g.
+		# adds vulkan code not always guarded by --with-vulkan), so force
+		# some major options that are typically needed by games either way
+		--with-freetype
+		--with-mingw # needed by many, notably Blizzard titles
+		--with-opengl
+		--with-vulkan
+		--with-x
+
+		# ...and disable most options unimportant for games and unused by
+		# Proton rather than expose as volatile USEs with little support
+		--without-capi
+		--without-cups
+		--without-gphoto
+		--without-gssapi
+		--without-krb5
+		--without-netapi
+		--without-opencl
+		--without-pcap
+		--without-sane
+		ac_cv_lib_soname_odbc=
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with alsa)
+		$(use_with fontconfig)
+		$(use_with gstreamer)
+		$(use_with nls gettext)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pulseaudio pulse)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		# CROSSCC is no longer recognized by Wine, but still use for now
+		# (future handling for CROSS* variables is subject to changes)
+		conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+		# use *FLAGS for mingw, but strip unsupported
+		: "${CROSSCFLAGS:=$(
+			# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+			append-cflags '-fno-strict-aliasing'
+			filter-flags '-fstack-clash-protection' #758914
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-mfunction-return=thunk*' #878849
+			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+		: "${CROSSLDFLAGS:=$(
+			filter-flags '-fuse-ld=*'
+			CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+		export CROSS{C,LD}FLAGS
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+	use debug ||
+		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
+}
+
+pkg_postinst() {
+	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 3f0bab8835c6..ef04f5e6288c 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,6 +3,7 @@ AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f
 AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156
 DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
+DIST wine-8.0.1.tar.xz 29057128 BLAKE2B f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4 SHA512 9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-8.4.tar.xz 29031312 BLAKE2B 0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235 SHA512 8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
@@ -10,6 +11,7 @@ DIST wine-8.5.tar.xz 29064032 BLAKE2B 35fa6d7ec88ff67d9acf13466b3618eb45d664bed0
 DIST wine-8.6.tar.xz 29118124 BLAKE2B e4659785722f0c1adb9ce4a156fbafc8484977a5fe2f4a6e1d5eaf8f1f14c6787f080b9d389cdd8716eb7fd00ee2879fab2042af5dcb970530d2e19628442c73 SHA512 602680675f5e062121767769106199179c52a6dd93e97b9b8b4d8365134c72f7745e37d4e3edf6c89c553fb1bfe55b914e77177508fb4f032410d423359abba7
 EBUILD wine-vanilla-7.0.1.ebuild 10516 BLAKE2B a6ae70e54cf3267bb6eff8a47d7c549ba9e8843b2ec0e24eee8e68ca3a3c1e1ebf570e23a8ff5fd6c520c8ceea635f2b8a08d9960fc030318220b644b02a30fc SHA512 64d3a95a34baeb68d021fd1de2faf796fde0e38ab9f56e98885961a80e9e8e26a4fdf755be28a18d1bbbe058a56825f8dfee1d4fc6b2ff67f06080dd5b982d07
 EBUILD wine-vanilla-7.0.2.ebuild 10517 BLAKE2B 6976d611eb52e0f20a2094685ee2d9b9db34ef17d424d43d59acf5fb864ee15ca60b964f12e16841238c3232a74debc134602dff6e08c81ee0dda82ee92bceaa SHA512 ea0dcbb249ff0f9fd7cff93af24ca5fe1cb6afbc11cbe28a6e8c2561c3721a4e555a0ea81dd816ae8597fbba7ae0f4b0f79a1b9c9f72800635dce1936b789e94
+EBUILD wine-vanilla-8.0.1.ebuild 10536 BLAKE2B 570e44c1e402460e42d2bf2bfe5f9e68c51ea3a3fca45c0032b0a07977a64480364e7d3f2a192a98eb8e5d8c7059b55b6a99fe88f63290964ed4001c4f68ccaa SHA512 defe5841154d8f3819dc52180a1c81812a1b1f8c842f5a14ec30877c453b5296d92d1c586823ab3232562ae3a52fe254866c1e3197d395cc6b76d731accc8a63
 EBUILD wine-vanilla-8.0.ebuild 10534 BLAKE2B 01742704db68023493742748281f19933ef206236ccc2b1bb16dd276ad6910362509a2f3c89c1c0803fa13bad0bf294356c6abe81207e750de1f1dc04ecc5bab SHA512 313ca0bfc18b4ec6bc300d7998a64ddc720e9b4463f8f240f539f9e814ee1fe8fea0b32ac35c510f06f328824441b05f347f8ea6d71caabd57641988e778369f
 EBUILD wine-vanilla-8.3.ebuild 10634 BLAKE2B 75887b9906eac617bb5bb7ea474f7c8e262a6a9d0c9be983cd5a07577e3158869002e74b935fdbe3bd81811e5ad975b55741b83f0fda248f2eb489a8e55489a4 SHA512 b0b405ff944b7115199d663a5cd149b9c4434aee6b07aba6b554a2e3dcee4feb188c186f8b77560787030fd0530fbe4fe5eefd2d02fac6a6bbe3f8d6add8d8e9
 EBUILD wine-vanilla-8.4.ebuild 10716 BLAKE2B 1538ea47e8e0f3ad6a7cb11be52b8e60519ece845080ed97afb678f14b66e8320dd68b89119bf8db46b8ec45957c31d5f49617493a5c71b4a5cb7f5c6dea8f95 SHA512 2074327e2084b6b9ffe0296783e5a5898d0cdeceb7051a4f5b06b6892da2aec3312130faaa3537a5e8f2062be1ab9ea2265250a469304852e12392c32f8a54e3
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
new file mode 100644
index 000000000000..44ecd77a00df
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index c5b5ce0523be..6526382cccc6 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -15,9 +15,12 @@ AUX xenqemudev.initd 1828 BLAKE2B 695090fca31cff426c8434fe7a766c491725bcc91975b8
 AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04285a7f589c6a69856f914096621eded787b0c23a3f8994076ee15d2dd3e2a36589a65cd585c7946 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
 DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
+DIST OpenSSL_1_1_1t.tar.gz 10061233 BLAKE2B aef89c338644230305bcc75dbc13d6799a04ed8c712b6aed07a782703031e977c3e300924f26e5854d0b89ecf39d2d516a50838167754e8f63322fba51de9478 SHA512 f28a323fd78be0b16ae6db9a8f163e64c74410e12ddd1a9836dfdda34c264112184f4e22583c84b6fa56716e5aaac9cb860cb183bd3d0cb064091eea1e21815e
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
+DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b
 DIST edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz 13998677 BLAKE2B 3614ceb69e295a6afb37c7905d0aec3534d8daf3d9f22137c1b722da6dc764a3669d99af03f96155d45feb5058a6f725acf37d1048186fecff4232d64f96e97c SHA512 a1933d815b947fd4f13c96970a6dc36c3048e3ddf27c897684104b0129cf58331e46d3147062ae1fb8973f08cd373c319788dd850ac5e45da385eed8368571a4
+DIST edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz 15245558 BLAKE2B 33876c08040fa876b4e3741fe859d113654013c948fa8a8b391955226e6215bbbe26fc484e56ba5b399d2c4e4d198900f2de42eccfbac6901e01cd73a80e803b SHA512 7d71ec3d98c652b86194607dbcab767160c708991f49f69eda1f5d844ced0c4842e849d19bf99ea09b1db523b91ced1e5552a4ddcea32b94b9db6b8f6f5c5931
 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
@@ -33,6 +36,6 @@ DIST xen-upstream-patches-4.17.1-pre-patchset-0.tar.bz2 87023 BLAKE2B 4b6c66c20a
 EBUILD xen-tools-4.15.4-r1.ebuild 16891 BLAKE2B 196a04b2d2bf0d33734b7086835aa84737d4b23c3c290e20d967e78833aeef71e0c0c853fcce2bd08e7b764c99e82d9e8fdcec177c24b76e8992f8e3416e13c7 SHA512 d2fe60ed130b5c4c2d8239472fd92db6d35baf60efabcf51089b44168b9839f8dad1916e7bce952e46fa49b2e39ad59feacd409fbbdaf65b010bb0ef6478ad44
 EBUILD xen-tools-4.15.5_pre1.ebuild 16898 BLAKE2B 399e699c7b43031c10c264911b79438b566673669799bbd892a7def93bdfbb6da51d1eafafcd919a5cda7bac9da57fe1e549a9c751bb2278f8f5772fca6d8ade SHA512 406d9c98717e0888e773957da582a3a6e7b2a84ffbbc11d8ff3c201c80561da47615b745f72322316349308d61f1c078c09139f8a740bb3c2f687e941b01d9b6
 EBUILD xen-tools-4.16.3.ebuild 16238 BLAKE2B 5eaab0ec3cbd2de0c8be12a03ca584b7b9037c379e4beb24f15043844bb7a4ccd230e730450cd4803ec9c7d19c1274c32d14d446d04f65190e7efeddab9afa47 SHA512 8000d9e9f046817b16f756d3d613e7db337e708bcf9a60312b3c559555b3db413dc673c6939ca4c6a172e1fbc0bd6888e418bb2f5427e04e7f30f68d3e38e6dc
-EBUILD xen-tools-4.16.4_pre1.ebuild 16245 BLAKE2B 35abcd9455d8536483d89e800d48a07e3fc462fa17b30041ec8ec839d18fab4e943a0678603021f539a220205d6bb8946952f9e1244044132d00d6e2cf7a9562 SHA512 e5b115714a1206ea7390956f109c0bcfac2442e59f382c9bc52d8f3038b204660249afadf0d6cb859dd7accf196f63ae2c931d0f6f49f75b929da64a6371b06d
-EBUILD xen-tools-4.17.1_pre1.ebuild 16259 BLAKE2B aea6c86c5da388e98b788ef88568c035a033a5dbefa727912762d435886290809f6343a5ea219d2241ffe337c2bb8016f88f62469121fa5f0d5fa74c416a149b SHA512 550e69dee803e19a35952402fb650fdb8098f0563ae6f2b1ff91ad4583d33d706f9a663c75ca74b659d2dd03af1731a3ad3baa5d057800c61bfbfa7513982438
+EBUILD xen-tools-4.16.4_pre1.ebuild 15837 BLAKE2B 83a9d7b7be1c5e1964c8b326a1369fb9ca3717ed720092a3a6484ed598d82e2f709dc521845c105c546752cf3128a380fbccc43d322a809b8e210676e57173a2 SHA512 b6eeac5e29085ed4c171668afc6c83fafe9fb45043afdcdca2848d435846aa5fd7fb321c295793f91409020ec4f76d8e4275552f8f663f073c5a6ea6453f4d43
+EBUILD xen-tools-4.17.1_pre1.ebuild 15856 BLAKE2B 080c541a5515bafa94ed37da9f0cf4b64271cb7c4cb9fbe149b28d2d87256f5cb6947e6751bea08c43e4be8402601e60c8e225fc9c5c73d3da88fd2d4cd442a0 SHA512 923bb51bafa5f36471507ff464af7eb40176cf81d429697b2e5ee27a7449e775fd71f43201eba771a0e969e9d2c4b9d22e1f9211da89367f457113891750d0d2
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
index 00ad2555a8f4..2d77d2480d06 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
@@ -17,10 +17,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
+	EDK2_OPENSSL_VERSION="1_1_1t"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
 
 	XEN_GENTOO_PATCHSET_NUM=2
@@ -268,15 +268,6 @@ src_prepare() {
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
 		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
 	fi
 
 	# ipxe
@@ -385,11 +376,11 @@ src_prepare() {
 
 	# Remove -Werror
 	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		 -exec sed -i \
-		 -e 's/-Werror //g' \
-		 -e '/^CFLAGS *+= -Werror$/d' \
-		 -e 's/, "-Werror"//' \
-		 {} + || die
+		-exec sed -i \
+		-e 's/-Werror //g' \
+		-e '/^CFLAGS *+= -Werror$/d' \
+		-e 's/, "-Werror"//' \
+		{} + || die
 
 	default
 }
diff --git a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
index 0ad9e03de6f4..2c7afcb524d9 100644
--- a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
@@ -17,10 +17,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
+	EDK2_OPENSSL_VERSION="1_1_1t"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
 
 	XEN_GENTOO_PATCHSET_NUM=0
@@ -268,15 +268,6 @@ src_prepare() {
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
 		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
 	fi
 
 	# ipxe
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 04e5b4860fed..d225e442a4d9 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index 45c72cee79f4..3240aa18060f 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -2,5 +2,5 @@ DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d
 DIST eselect-wxwidgets-20230114.tar.xz 11328 BLAKE2B f417bd1549d12b9a0ec629d92a38863caafc000a6212560f1405930dab6149c106836d0d1e61d8dbfad14059c628775e85fbf0ecdcd909403e06f666aff5e684 SHA512 0da2713e61920792a89e82334b1561464a0afbc61aed7857b7029980370b7f023edcae0da8d7225f091e65dc207e6c346cd4bfddcbe06a71264f597ecffeea95
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
 EBUILD eselect-wxwidgets-20180529.ebuild 1475 BLAKE2B 175bb052deea18c0b3af895e9059df7d43cda8f1ecfd3af1f999a9b2e0790684fc197552a20850c2f2930d102a0c3756d9d51d554739a6868bcfaa13ded3ee16 SHA512 21c257c106e5066e4ccf649efd08485392442882ca9174ad43bac0ccceb28c3996314ce99476f7f4deb6c426d4a5469457916331ce6435bcdadad44f9aa3217d
-EBUILD eselect-wxwidgets-20230114-r1.ebuild 1374 BLAKE2B 059885801b290128cf5dd4431187745749df41e8bdccb4de8627694fc9b96147c7390a262212999607c7cff244a4631924c1b43f4bd8d2728f650c71eef9b289 SHA512 14dc4efccd304165f7c587679165e34f1f3e5be943d11cda1d35bf5a1c0aeb9685fa487d41fcfb75c697b95557d544a4b633c51c1966941c1de9c5d515cbcacb
+EBUILD eselect-wxwidgets-20230114-r1.ebuild 1371 BLAKE2B 9fdd97fe4e75b1dee156d6513f50fe30f49a55129542d7d9e2162bf5e3b9fd7727a2dd5a5a00c9b0956ebc4a8ac24a286ccd61c3b29b4382da6209c2b0b09549 SHA512 474281fc4db9c4edeedef97519c115c552d3f52c598bebd00368b24b79aa13b051a63d08c990cc573158690ac07618d28ee0993bf6c43eb40fe77d5814e018b8
 MISC metadata.xml 286 BLAKE2B 91c8e29e8be49c7c6771d57afcc8e56318257f45486adcc9c783b8e658b144306cf9afb5e40ec85a9efd83d1b94e7d849234aaf9c19fe161d18d7a4dce548d5e SHA512 8c4c678d180c83ab8b5235d415a740593795675c74118aa927965a2edb18fa411b17797b0d4049cc67428420f6dcd40636267a7784b61bc5dacd27fb59bcc5fb
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
index 8d8852b50825..5764455d1637 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8257a456c701..8d90142e7318 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index 756c67484794..608ea5ad756b 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,5 +1,6 @@
+AUX g810-led-0.4.2_gcc13.patch 504 BLAKE2B 51b11efa363290a7f75e6b1d2f2f45f3ff0d1aa7e179f4d80f2353ffd13991ed4b92b1c03c3622974a19a4dd18025653666cdc918c0546a0ca77bf48c86aced0 SHA512 3beaf50e7fcfefa1293c02d140ec59495a135437ce12c73073c8591820eb9ce23a2e2c09b72eb7e3ff3fc1db97f32db126109cb691a8ada4fc400e79747f9d82
 DIST g810-led-0.3.6.tar.gz 34544 BLAKE2B 142fd54d7721a1deebfb019b644a4c8ab0fd5e1662391075cea67a4c7b7145034101f14c22975bdf079ee5b8e56c4a73e18fe31ce5d7fcf20ff4b9c64ee85502 SHA512 5a1877ee135a662bc5eb15c1afe5370cfe9243b4479823e3492f0da8f407b1438e3d7e35bd9992eea8dcbd4d548c9acdb7e74f4c99efbd4e9e8e6ddae33f8a5b
 DIST g810-led-0.4.2.tar.gz 36669 BLAKE2B 738ca1849b05ddc35e42c258f67b2fedc2ab207594a32111aeca8cb1cffa99580e0f22e57ea92aff0e49f546e871b5af1c77cd5830349af98c9a977b27a0186b SHA512 03e62265964b6d47d474b57a92beb3a017e8479113750e7d52790d0779b8893eb7e3761f236db94ff1e1ddb0424c711fd1a35c869d0f93ad68104b1ddd2bf1e8
 EBUILD g810-led-0.3.6.ebuild 1023 BLAKE2B ee801168b7b981d46d59c65b1081a6fd87fc5961c49a1694dcc994c042d34d3d02e80e308e67f18b55f46411a048d97e3a2612d9dde07e5533326ce0bf01d5da SHA512 d05c4eac97cc432f09a64f3707a34779de87c5f79ebec153c2b4b1084ed891cb29f8a2956d7c985fa729c6e786029e9a29230dcb34974fc03fbc1d14202a2be9
-EBUILD g810-led-0.4.2.ebuild 2026 BLAKE2B 3ffeb677d8f91dba21fb4eaa5b1e38694e25c203e09a17165c8eec989e77bb954b1b5246f2a244eda94ed7ec6bb8a1f33e018a7e163dce1e5cb0635a844cc5b0 SHA512 ef8ce8e952dbece22c71e31ca601b6ff10b1fa94450569bdeea85861413f3e6a448e4db69a65a76f63ba43dba624aac6a5f02d8c8394ba0a64257432dfde6a8f
+EBUILD g810-led-0.4.2.ebuild 2161 BLAKE2B d162c4066800578dedb41a923f9d4a9f1ded2c7253bd503b07f3f0db3793c2cd979aaae1bd997ab7660ba2ce6ad44c555c751c242cdf2ae4b3aaa4b8cbcbfb11 SHA512 beef88c04d957e8539861ae5a8cc04befb7ae86ee096faf16950ed3d8b1264137eeb20b9a3984775cdaaf14aa70f12793142483b0f78eb578cb944c0e586ddc2
 MISC metadata.xml 641 BLAKE2B 566bef8395d71af1cf012d42be32f817b558674b7cd37b61a7073794c025414b3c7ca09b701774cae9728cc4396b0311bca4230330047134e43c9974ee2d8246 SHA512 51510c9a6dc3e31469b1d78f78f3ad133d9b6e7846346bca23fa76bcd6b486824e5518ce2b309fb4aa9dfd76e9840d92c9c87f5ef1c2ef589dcd5e4d5a45a4af
diff --git a/app-misc/g810-led/files/g810-led-0.4.2_gcc13.patch b/app-misc/g810-led/files/g810-led-0.4.2_gcc13.patch
new file mode 100644
index 000000000000..041f000aef1f
--- /dev/null
+++ b/app-misc/g810-led/files/g810-led-0.4.2_gcc13.patch
@@ -0,0 +1,21 @@
+From 0ca17e2ba8c8f01e51a360903a2009186ff78a1c Mon Sep 17 00:00:00 2001
+From: Olav Reinert <seroton10@gmail.com>
+Date: Sun, 26 Mar 2023 13:48:10 +0200
+Subject: [PATCH] fix: compilation error with GCC 13
+
+---
+ src/helpers/help.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/helpers/help.h b/src/helpers/help.h
+index 1d176f0..b7d02fd 100644
+--- a/src/helpers/help.h
++++ b/src/helpers/help.h
+@@ -18,6 +18,7 @@
+ #define HELP_HELPER
+ 
+ #include <iostream>
++#include <cstdint>
+ 
+ namespace help {
+ 	
diff --git a/app-misc/g810-led/g810-led-0.4.2.ebuild b/app-misc/g810-led/g810-led-0.4.2.ebuild
index 5b912b7836b9..b99c5dd3daea 100644
--- a/app-misc/g810-led/g810-led-0.4.2.ebuild
+++ b/app-misc/g810-led/g810-led-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,10 @@ DEPEND="${RDEPEND}"
 
 DOCS=("README.md" "sample_profiles" "sample_effects")
 
+# Fix for GCC 13; Bug #895426
+# See https://github.com/MatMoul/g810-led/pull/302
+PATCHES=( "${FILESDIR}/g810-led-0.4.2_gcc13.patch" )
+
 src_prepare() {
 	default
 	# See
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1be0f8810fb4..6a7d43e65fea 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -12,5 +12,5 @@ DIST lirc-0.10.2.tar.bz2 2418298 BLAKE2B fa067ff3de9779962e34a87f948b978eae73056
 DIST lirc_0.10.1-7.debian.tar.xz 39392 BLAKE2B cb7527bb33a1d724fea487ca468f98f406c8af894b185580dd285ed46ee0d7f6eeb5c2d66ae09c917d580485568f6510ef968283c56511dc9b4281c77fcc4563 SHA512 9bcd7dc2d30647ab807a65036c02d4adc425af288046d8f0b9bee2f38389f39be21103e4980684827e736b4b76a05688ae870f0871bc50213de429c35b70211e
 EBUILD lirc-0.10.1-r4.ebuild 3881 BLAKE2B e887a065208bf0d87685c72591a9c5df2a39e6ad9cc31be4bb0c0a1bc907f27aad7f5dccbcebcb8a5b7f3be4ffc3bef50c6ef48335c5c6a4c171cd8d2928a47d SHA512 8a11199e207b76ab7b8b5d7556bac43529fed8dbaff045d804a20efc39386aaadc7c50caf35c9fd8e9cbbf031d1069ce80ca00eca76e58a7dd66b1e29d79da2e
 EBUILD lirc-0.10.1_p7.ebuild 4367 BLAKE2B dc61bf8ca9d4b9e020b3183716a253e53a7114f913666406e62e3697a9918a07dff01dde7e35cc8d2a6001020b34526f2cef80d7beb1889dd389eadc332269a2 SHA512 0c9543e6af4cf621a664e3daa675f7c44289c472058df9f870eb6f7fa59095211613c48745bef55699ff7ceb481e4a2804eb658d136b8474c0e5de9f7edea2a5
-EBUILD lirc-0.10.2.ebuild 4332 BLAKE2B 52dd327a328ca651d53a7c9a3ae8bea4180016745d74d8cebec14b49036ac6e1e325074e487d11dd7bffe1a3fa2a3482d607530f6c22743ecd9a334f19933407 SHA512 980a8cedccdf7af3c99e31bbc229b5fd8804f81ac534f098e4b51dcaeae41a59847c2f2a557b765009f0118b64a3ee0b1aeba20525e98a99d7d9a39b50a254a2
+EBUILD lirc-0.10.2.ebuild 4328 BLAKE2B 91e8336f1fd66baf4bc6d5507e264f7fd94c6f64187c8aedef68ce4cbad38def54fbd40c7ae0adda036a2eee3d3b5bc811272024ab8a47ae5171def00853a19e SHA512 3af33eca08178e20f4758c492f2576f094f0c6943bac0049c838bfebcd4f5820064644060c0ad64f94198317cf011a25dd8819a9eda0506eb18049e2aa6fa31e
 MISC metadata.xml 829 BLAKE2B 987d7dafc070e593a79a65ea323684f5722ae167060e9ddd22e362c421fdb8ee254e7ca8e87e6a29ed1f5dbd9114c29dbb97c4643f9b3a1f43443fef18841afe SHA512 93498941521daa19726f37a99d016ca365e233353f45bf42f1b4facb8cc9fd6e6421ebaaf19e17a7fd68d0d0e52bd2c5b954c2fa523868458b90b28118fb6d42
diff --git a/app-misc/lirc/lirc-0.10.2.ebuild b/app-misc/lirc/lirc-0.10.2.ebuild
index f9b8428f0f19..52f90af591ed 100644
--- a/app-misc/lirc/lirc-0.10.2.ebuild
+++ b/app-misc/lirc/lirc-0.10.2.ebuild
@@ -28,7 +28,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
 
 REQUIRED_USE="
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 3e4280008c1f..f700bfe3cb41 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,4 +1,3 @@
 DIST media-player-info-24.tar.gz 90017 BLAKE2B 4b8dff7ebc910cdee986756d211f7cec0c08d5089bc5478360bcea3d24613118d3e2557633866345b1970a39a1de5ff10648ea71b7ae6ec7e7ae5635b6d46bc3 SHA512 b762f82280d7ddc3ecc4cf612f6fb3bf887c56a3ece7d9e4a45ebc7e750d71a20ba70dbff63c2b5abaae0f1c3e079545e95d8eff07ae25e27add09e92b2b1544
-EBUILD media-player-info-24-r1.ebuild 1041 BLAKE2B 3b52ed6858dbb7254cb2de6bd32ade330868e13387876883a907f5812b104a062639951b68f1f7bc66d5982c1fb6aa69a568f101ea76ed06d63d3c2bf853bd19 SHA512 6012110e763c5120ce6eed27f75284dca7ca32cc8d14c0a592b7a5abe824c3b4b897751fe6224a2791ae82bd5f2b1b2c119e323f8fbac35c55ae4c7350c98027
-EBUILD media-player-info-24.ebuild 1028 BLAKE2B 51a4173fac7c8c7eeb1cfe63ac46345ee2523afbd50384b24ce7af20694e8ba1662af98f0cbac49fcc7245ace464bbae3f43e3e6b67930f0510396bec5dcf4f5 SHA512 baf7da98c7fbd69033c336a4782d55975f803f3a45f5eca052ce741738f853fe166cf621be6d757cdcebd080e6f4e4f064b161d3ed5baae9f19dc123d92be194
+EBUILD media-player-info-24-r1.ebuild 1037 BLAKE2B e4a8acf8378b13cc6792865468d04b878ebe8fce1dda69e55ca70fe3bfb71880852d2fd55e03135bbb7ed9208371de4c1b136f1fa1741af517c5eac566cf9f74 SHA512 84cfd48d38d9e8abc42457933ca1c0aa4128122b5705af12261d1eff5c4b1c08532d9b300b221ad6da87a70dc49094afe6f3a0d66be5bb0dee236c7dd337f052
 MISC metadata.xml 267 BLAKE2B ef54b6ba9665188ba4761836dbc7fa03e202ebee4a80e5d83ab96dc55be82dec71bd830a909cb254f3169be9dd26f0359bd7ed46d7d75974d62a6f0669b70187 SHA512 38c06607eccc2d3e3df74e1b5eca49eb1396a1f9460cf13a6f1c0519c26c413e461b58a526e137b9d163c40f76a391eab5178956b01964ba46938d72ab0176bf
diff --git a/app-misc/media-player-info/media-player-info-24-r1.ebuild b/app-misc/media-player-info/media-player-info-24-r1.ebuild
index 6dc0ad8e730e..9dd9b9b825ea 100644
--- a/app-misc/media-player-info/media-player-info-24-r1.ebuild
+++ b/app-misc/media-player-info/media-player-info-24-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 # This ebuild does not install any binaries
diff --git a/app-misc/media-player-info/media-player-info-24.ebuild b/app-misc/media-player-info/media-player-info-24.ebuild
deleted file mode 100644
index 89939bd8eae0..000000000000
--- a/app-misc/media-player-info/media-player-info-24.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 udev
-
-DESCRIPTION="Repository of data files describing media player capabilities"
-HOMEPAGE="https://gitlab.freedesktop.org/media-player-info/media-player-info"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-# Upstream commit d83dd01a0a1df6198ee08954da1c033b88a1004b
-RDEPEND=">=virtual/udev-208"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-DOCS=( AUTHORS NEWS )
-
-pkg_postinst() {
-	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
-	udevadm hwdb --update --root="${ROOT}"
-	# Upstream commit 1fab57c209035f7e66198343074e9cee06718bda
-	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-		return 0
-	fi
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index 72e3857db715..f32705544215 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -3,6 +3,6 @@ AUX OpenRGB-0.7-r1-udev.patch 410 BLAKE2B 10e4ba5cc32abed1c5c6bf15426033b03c3692
 AUX OpenRGB-0.8-includes.patch 769 BLAKE2B b996f9d9e8e68416814a763451f6b706eeed8a884e5672ab26c926811dcd4b340afbbf8dd093a56501696a5c95a250f4f7317f5d5658c3b1d60073735fa1fd58 SHA512 710058f60a916404b1850e82a4fdbe9689cee6af8ed783a4a74297dfad46165227d88bda39816ccddcbdff3ef939a930a2977206d746f455e788af504ab91405
 AUX openrgb-0.8-gcc-13.patch 1822 BLAKE2B ef10b19c587919a99e5343cb0f8280d8cc6fdc199b9b5b8dac7f4a9cbdb8af0d47cefb6a015b6720b3307558227673c657701d711e256a61a97c0760b442b1f6 SHA512 e0ea05b27ef3a7936e9f1a6b3119bec9764562885c990c3fa9fcbfbda1eb556e5f696ed3f217dff74b97c109d1ab0cbc987fa1be505b10301f6726c77c4d37c0
 DIST OpenRGB-release_0.8.tar.bz2 28631365 BLAKE2B 3b328e38f1c52646da02b0b2b2c22b1285f3b31b0a2bc684e99d491d04bd14a91b49bc196b3b81b537320cd872e5568aaa8aec34744f4f15392d9424a81ac6f0 SHA512 d69686da7cab33099b13cfb5ab876fc2db047f79aa01bf8150507ec41321b4c6c092f81623823b89916c70a1a24c4a102f77b1001c5caa721ff4c0c52e0630d2
-EBUILD openrgb-0.8-r1.ebuild 2288 BLAKE2B 6e54d10b3f06f774bfecc0646083f3d4228153ee9f0d62f9f99ed0b5cddc48f86a539ad9e044d09e68fbc9292cf59b6e69f756254b487b65f803b36ff4ba8939 SHA512 dcdd8e0e17684f6d3b8dec04e8c49721bde656d525b65a2348ac8639cb064b6bec747b660d38a4d683837f15cfb528d4990e73c690861df59436982eae123cd2
-EBUILD openrgb-9999.ebuild 2207 BLAKE2B a80ad9c6ba5d042101e80941184afd24039cca544c920cfe01919dae874ac99af76fb23dc36c6f5b759c05b577a161823e771dee093d73a252d7c6d280e2e830 SHA512 36dd00491eed7e4fc069c971a44b1e5bf6526da72434ccfba88c092720a9f8d050a09762c6ab464f1ea5a810c5dea50fda3fa95819d8b7e04330a3c1f41d3918
+EBUILD openrgb-0.8-r1.ebuild 2295 BLAKE2B 5afcfd34951da11f082158fa6cf672e64c6779a1c37b44745407d0be1259f73a21971977f8be2fb6aa67e0a86ab0cde44b299391879b3357eafb0b33113ad225 SHA512 80e3a01d1e9e5b1734ac2d10a42fe8c590f435b8de8088438d2d03d8e5918f999db47f749c2c4c2aa367562de42496c11949e199a1dc282d48958cb9bc020e9b
+EBUILD openrgb-9999.ebuild 2214 BLAKE2B ff82e906f2a33ca4b8b015e133c7ebce737430884aece52b75a883944b6ebcd4def3bc60ef61bd5abb8a9df0840f401f046ab1660149f394670c614a2e8a810c SHA512 186284c9cfca9437388353ac8212e62a12559d34a1c12141972f8a5101e4c82d0bc11cba6e4dd86ecb1dffa075b2e1454afe07a31f9a1ae27b980a925f59a5d4
 MISC metadata.xml 1228 BLAKE2B b3844d9c8b09d9d976ee41d874675b179a8e38b1eaaaa06e3052d6bac824dfc8c67102de54d9f62a3f24e4cf0157825608c060a56de2cc21bb71f8c7831148ad SHA512 5067cb355010ada60bfe789a511d02bf3d3a26083544104d782b9c08b0c70457f998c91c71f8d99e48f2d73fef07ea029fcc8c7848bdc5d625f5c1a8c9ca9ca3
diff --git a/app-misc/openrgb/openrgb-0.8-r1.ebuild b/app-misc/openrgb/openrgb-0.8-r1.ebuild
index 05c82b84efb7..d80c05c700e6 100644
--- a/app-misc/openrgb/openrgb-0.8-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.8-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi
 
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 516276f31fcd..291cae9fb808 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~loong ~x86"
 	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi
 
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index 2b9a6ce25e73..cd26618f1c97 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -4,5 +4,5 @@ DIST resolve-march-native-2.2.0.tar.gz 15110 BLAKE2B bd0fc09f35bcc46727a9d105d09
 EBUILD resolve-march-native-1.0.0-r1.ebuild 492 BLAKE2B 3957e10de33e2d28856187a8a8776178c500a7352454323904919fc5bcd5ef1e9461dd425d1b463bde18da4d13c046a45a07c9613afb9f2087f3d465383c3b9f SHA512 23d16c07d7f63adccd42d59dd4b51269edc752ec88904b1453314ce43746c66523b15642eced9d269d5e46556f84231d173eb003ac5909ec74de61fe22806faf
 EBUILD resolve-march-native-2.1.0-r1.ebuild 526 BLAKE2B 793a091f444aa5f9293d6d4f4049bee62503f1b06fce3131d178801576a788cf5f177acfbd57695250f7e148f26261169c1c9d0ccca5d16b6dbcbd7b8493d728 SHA512 f3450ed3defe168cee482580a18b7620fd6fa5593776bbc13f6be1f3ddef36a298b1df9dff34b9ddbe6fd64fb2cc41fa9211000e575d6ea9640520629ceb6a33
 EBUILD resolve-march-native-2.1.0.ebuild 494 BLAKE2B d2ca98be590c3b3ffbffbf73c604be60c167572d9cb7b76677add72c4063ae01bad195f68490cf3bb64466d297525a1747dea44c1f6e90f280f6d07561a951d1 SHA512 f453070969b57658edacd18fc4b2e6acf9f161c99ddbf7f1708c699d41c6df6c5b2e99b4da10758349fb410e342dccd778dff409a6d92523802d1b7a2e415f7c
-EBUILD resolve-march-native-2.2.0.ebuild 526 BLAKE2B 793a091f444aa5f9293d6d4f4049bee62503f1b06fce3131d178801576a788cf5f177acfbd57695250f7e148f26261169c1c9d0ccca5d16b6dbcbd7b8493d728 SHA512 f3450ed3defe168cee482580a18b7620fd6fa5593776bbc13f6be1f3ddef36a298b1df9dff34b9ddbe6fd64fb2cc41fa9211000e575d6ea9640520629ceb6a33
+EBUILD resolve-march-native-2.2.0.ebuild 524 BLAKE2B 9283955da0b65409f536734684002f62d7a54189f240078e077b45a72abaca71384f48be28e0bf8b7e79848793f47565e23e2ebf1ee63c927dede11c613b8476 SHA512 a37daecfa5026a2d0718cbb24b3e26247895e0ad41fd23a5b821a12b8a1cda49b0085db67b55f83403c31e5aa4140abb1b83981d682dee1e655dfce49bf49f43
 MISC metadata.xml 344 BLAKE2B 90b1eab14f1ff2330a87a33bea4de6d1179aa4fdef0460d3ce08054afe2abd23d09a6798539c2ac17b4b512db6777ff4274c883c5bba59baddac8cb873563fab SHA512 67a6747446ff67ecaddcce213508c6e01b3734239716bd051416e96a73d03b00340bffb74cd47cd4e1569ff2342c21d794f361d2b68b49ed4910eaad8421470f
diff --git a/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild b/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
index 66670c04a72c..a94cf77a84db 100644
--- a/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 969b80ec7ef6..cefbb92a902d 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 79c780dd5783..f3a55472456f 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,4 +1,3 @@
-AUX ledger-3.2.1-fix-build-boost-1-76.patch 650 BLAKE2B 7bdd5200cc8facf7a233ea4cab60159da586dea55694cb993494747b8fbe849f197c1cde9d471a8ed1a2c6734480bb0dc8af0ee4dc07afe78ca18bc6b5a60a15 SHA512 3255474d916c6f1e9faf3acd3f113ff8c9c4e44367be644d83bb5a7c5d0fbcd890e95f6d2d649ed639afc32498969a3ed996d1ce1e59a6a0b924b9d4ab6bb548
 DIST ledger-3.3.1.tar.gz 825005 BLAKE2B 72207dd53e8e8a201511cf9ca245c505e953fee4dc88e2be46753f4037be46dbd882ed94327f502622c1a23f332ddf9a94d2dfa60986fd82f192103612da6ca8 SHA512 6271f5beb0d0b9f157c06bf701f302b229bea1db5343f9d9239a8723039f248920d545bcc4fbea35646fdbcffb960f7830266b141a58ba88496ed34ee7d770a1
 DIST ledger-3.3.2.tar.gz 825274 BLAKE2B ee0901eaba234688cc36e399bd86118269d8691162feacf25e70ffaf28e8d572f47a62fb014126f5dce65c73135f21ad4364a642637a80d2577bf20b657fc9a4 SHA512 d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0
 EBUILD ledger-3.3.1.ebuild 2392 BLAKE2B 0ca2fb25ab9bc07ad8da27d6800115c0791aa8d9c658f75fbe74a5743c2d9dd07f6d058cdd9fe23659a4fcdf72d1bd1ef44d44bc379b97d0d8f59c286a85492f SHA512 1bfff76995e6c3fbb6146d836e0399612baade304bd8b800575b880567e7dc0560fd17339537e7a55df30c336b098df564e165ef483015a8ef6be3f0fd95f957
diff --git a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
deleted file mode 100644
index eff3e335f42e..000000000000
--- a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/790176
-https://github.com/ledger/ledger/issues/2030
-
-From fa37f595b3c44dc7ac86b29d105ae6417c3e0080 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Jun 2021 12:37:58 +0000
-Subject: [PATCH] Fix compilation with Boost 1.76
---- a/src/expr.cc
-+++ b/src/expr.cc
-@@ -35,6 +35,8 @@
- #include "parser.h"
- #include "scope.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- expr_t::expr_t() : base_type()
---- a/src/format.h
-+++ b/src/format.h
-@@ -45,6 +45,8 @@
- #include "expr.h"
- #include "unistring.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- class unistring;
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 04ff27d82fcd..ac478fded4ce 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,3 @@
-DIST wps-office_11.1.0.11664_amd64.deb 413652340 BLAKE2B 5bca47eef4c0c6a418ff5d79cef46ddd8841400333e72d3ac6fb5337d81fc7265503226da7d78b9a1df0cccf8d021852c69d2f65ed88ed74fc531638ef557f08 SHA512 6dbe7df259d989389df9d3c5730966693538ab1ef95c18a66cd50609894c83b028190f7381e1c998b0470d389c8c6969d8528ef88bc6428fdb0123586880de08
 DIST wps-office_11.1.0.11691_amd64.deb 413557282 BLAKE2B f3e9149c0c1e43956da47c1e5faba4a10ed5e6964760dcc42b4e6e4a56777a9c6ba810c7b477a8bfc70ebc8e8ef11f9dee588be6f1243439edccc56fef0aaab0 SHA512 e19a2d6dc05b5ecc070966f92b9218749266e4d4255620e376c6888044bed83d06455d16372f081b7a7067b6c1e63e67bb3270468ec0731ebb7e308e1afaffc6
-EBUILD wps-office-11.1.0.11664-r3.ebuild 2553 BLAKE2B 6fc6fece90e64d079d2a72d9439de04ac3fa3b182237a42118f1d5bb3a03fcb45638ba23e3f1ec5472e821b4a3db6ac4be86e5a75928c3a89f99c211f03f980e SHA512 aea15abddee3c8a7f6dd0cfa07c221e75648f8fb749ca7a099bef3ed67e396ab9130675a5b90b204be41fb574d90a8443ae93ee5fe2b8527522e76ca62be04c5
 EBUILD wps-office-11.1.0.11691.ebuild 2275 BLAKE2B ca733db3b2fa0a3a0bc897a213197cfcb2176476aee9ce87ff09eb8bfbedbbb9bba1b0fd4348113ae01d07c1b19b6ba2fd8f96ad8365dd2df34b663ca2986556 SHA512 b392930ef30e4d35e2d386fc4036f5bee3d5552956a7fe32e22363bf65ad4ceac3193e0bf6861d4ac8bfabf5bba6bb697233b744708a0bec3f8892520db2b3d9
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild b/app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild
deleted file mode 100644
index cdece46b901f..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.com/office/linux/"
-
-KEYWORDS="~amd64"
-
-#SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
-SRC_URI="https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${MY_PV}/${PN}_${PV}_amd64.deb"
-
-SLOT="0"
-RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
-QA_PREBUILT="*"
-LICENSE="WPS-EULA"
-IUSE="systemd"
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46:2
-	app-arch/bzip2:0
-	app-arch/xz-utils
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	|| ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	dev-libs/libpcre:3
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	|| ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libvorbis
-	media-libs/libpng:0
-	media-libs/libpulse
-	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
-	net-libs/libasyncns
-	net-print/cups
-	sys-apps/attr
-	sys-apps/util-linux
-	sys-apps/dbus
-	sys-apps/tcp-wrappers
-	sys-libs/libcap
-	sys-libs/zlib:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXv
-	x11-libs/libxcb
-	dev-libs/libxslt
-	x11-libs/pango
-	virtual/glu
-	systemd? ( sys-apps/systemd )
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	insinto /usr/share
-	# Skip mime subdir to not get selected over rest of office suites
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
-
-	insinto /opt/kingsoft/wps-office
-	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
-	# https://bugs.gentoo.org/878451
-	rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
-
-	# https://bugs.gentoo.org/813138
-	use systemd || { rm "${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
-
-	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 266581ed9daf..b0ac68b76713 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogv/Manifest b/app-portage/elogv/Manifest
index 578a69f6f449..0f615fba1b65 100644
--- a/app-portage/elogv/Manifest
+++ b/app-portage/elogv/Manifest
@@ -1,6 +1,6 @@
 DIST elogv-0.7.9.tar.gz 19556 BLAKE2B 5d5f1a4adab09cf8b56ca3433b2a1cd0d3572345ff92f34b6b3ad175178161c36531bf9211563f4ad18191c6ff99c2cdcf9c3d188eca293a1698157e0a9f04a2 SHA512 703d1e8f55f5ee17a393f3a331ee38ef1d4e4c918c316055d5e2297b96dbe7de0ca6df864f462520f2087ed1a7bb7f43db56bfd3864a865d349516694522a686
 EBUILD elogv-0.7.9-r1.ebuild 1710 BLAKE2B 509a8d1d7c56addce062c481098dae4fec032594ea5387d24e371d748a4e0b5630927ddc4b8da936e67d3bc532cf194c6560890be7fdbe0fde26a50c46f64c39 SHA512 f41d3f9cbdaf6331389b0978ea388fa1bceec2e986ea158876c8910d7136dcce48f818568076aeb572b9f8474ea6d790dabd9fb99fe4ad35b8555ce08d21c6b0
 EBUILD elogv-0.7.9-r2.ebuild 1729 BLAKE2B a7789ae2fd5a35c7c432de4e57fe81dcabd0ac7bcae1804234dd27b54b1e908ce3739c07832e4791b44b942a411cc2980dbaf18910547aaa97a11094bd3bce09 SHA512 c4772d1751846f7831de986d695f3bb63e58db054453f2619d88d109259f44dc606d53d49009b62227913ce24c902c61ea7eac5ce62d67d28218910b45ca52dd
-EBUILD elogv-0.7.9-r3.ebuild 1730 BLAKE2B b800101e7aff9eb3b4721bcd12b9c15ade4a2bc0ae8dc16490614a56ae81a4c391ca71146fb432e9edebe77f96fccca344a6ff7f1ec696f40f80ea48f072ab37 SHA512 b0abe78059c07c46665f4845991b5cdb945446e65bea869f88d6cd97d21cbbb5406008a03f5518c1dfab9b582c283fcff3dcb66552b32edb3242e19b29d124fc
+EBUILD elogv-0.7.9-r3.ebuild 1726 BLAKE2B 63546a3e8a7de3e7daab298092a4eb1ab9edd530307b0bb2161df751475b8440057cf1efa3718035f2518f867fedd0e4002dcdc8918f9370eeacc906478b0127 SHA512 2661087131dbdc8f14c346cd1f8a40601df80c625aa5f8d0e91a4434cea41ae28286f7ef45196e1e502afdfe0a1688907c16b952391bdfe54681a8b38f24ab42
 EBUILD elogv-0.7.9.ebuild 1607 BLAKE2B fa6825ca81e26df9c4c60d2ae2e84e333ad28af53939d5bd3ccc34e6007cf6cee0876824d4db0bfd3c43e8ef87591d7e231de1204f106fb6178c25b55c89560a SHA512 04535406acec34cb3680fd3b85bc22b59174a2c655b275caee34e539fff88c84fe552c97006cb7e6b783aa7bd9d97e9ea2553960868c0673641959620db5fe62
 MISC metadata.xml 470 BLAKE2B 8929c8c694be9a3296adfdb126acc0505333cb9b780a6ede783b18046f45d90a75039fd02742b53982a67e10912fc091528a75775aae08aa725a16c9df37ab01 SHA512 16782cd7c0f06ab11b81ab3c3850b6084bcaf160e2e0e383f3a0cfa9737f73a9ad3f2532b1b3c779c7eea746aaadd2e360f6e2b57baace74f5a18e4ca266ef17
diff --git a/app-portage/elogv/elogv-0.7.9-r3.ebuild b/app-portage/elogv/elogv-0.7.9-r3.ebuild
index 959c38572a39..3e9b628d1a51 100644
--- a/app-portage/elogv/elogv-0.7.9-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.9-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 PLOCALES=( "de" "es" "it" "pl" )
 IUSE="${PLOCALES[*]/#/l10n_}"
 
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 6c9eaa516f1c..49f70fa67c9d 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -3,5 +3,5 @@ DIST flaggie-0.99.2.gh.tar.gz 17279 BLAKE2B c9015647f5a67e0a5d87e3f9af95784ca2e1
 DIST flaggie-0.99.3.gh.tar.gz 17295 BLAKE2B 104406406b5f256c55806737339a57ebfbe3991229dfc357f99af854497f8aa7ba7465db1a126970e10e86e0c76520dd2280592b00cfb8c48a92c820c794c2c4 SHA512 cf71cef2f8c75ab8c93db847f1e484907b4abdd36e0d185aa8e09628abfc64da7daeef5ce169a09337aed6bb19a1fd2c8b41aa9226abc78da2481ab1af709bde
 EBUILD flaggie-0.2.1-r2.ebuild 1134 BLAKE2B 2708bee42590a08aebce95988dfcc2407d54bac0eef661af8346ecebb72648f68f42744f8b014d960f0055c4e5eefd16d190273296eefa61b36b67fe8a48feed SHA512 bdd64fa00b932b52d2407893615f5cdc61f8d9f926dc279d0c0fe9e1ff1aacac062416c51ba9fc24c081e2cd85fff65c0fd066f7db440d37aca0d08c98a09404
 EBUILD flaggie-0.99.2.ebuild 885 BLAKE2B d2868967371b5c2b97616a5dd817e48e5675164c3e2a70166b13021f384555a1c53c77163c13afa213f687d124b377ea8aff23ad7a6b2ed21b4d37b8f8109762 SHA512 b497eeaa3f74280f1e8f8689013adb1371dae545ee62cbde781ef503cf2c031c3c60597e7ac28234280bbdb4fa0cb16404cf6f1a055d112c112b1dd9ddfde4bd
-EBUILD flaggie-0.99.3.ebuild 885 BLAKE2B d2868967371b5c2b97616a5dd817e48e5675164c3e2a70166b13021f384555a1c53c77163c13afa213f687d124b377ea8aff23ad7a6b2ed21b4d37b8f8109762 SHA512 b497eeaa3f74280f1e8f8689013adb1371dae545ee62cbde781ef503cf2c031c3c60597e7ac28234280bbdb4fa0cb16404cf6f1a055d112c112b1dd9ddfde4bd
+EBUILD flaggie-0.99.3.ebuild 881 BLAKE2B 67030b2316196987631851e6d20d3e112e2c8fc2283dd68f3a83511a7f3636e8ecaa3a0dd5a2a921bdf95d9bd4f591d0d930f2d2fb936b7ca33c63baf5bbbdac SHA512 cfacd16b2660dc390fa01062257074eee73e24eb09612dd0ec3baf4e5e0e6832313a513273e67ea3253ced89cbbb876c990fe836f17baf9194299ee932251353
 MISC metadata.xml 414 BLAKE2B a2588b6736a139961f6d6902437c9bdf0418eff547ce47814ed2b5630a3b27a74798434971de570ec740c4364b808c1035ea624bb4c0d8911631c72e8e43ce61 SHA512 a675b33fc1d436db9215f2bc373258749a34f31f9b70d0d191d7464eca0ef121ccae2e5aa3f7537ed015fd6bbd02ab91264576080725b6c50c3984910a7ed05d
diff --git a/app-portage/flaggie/flaggie-0.99.3.ebuild b/app-portage/flaggie/flaggie-0.99.3.ebuild
index 085b4583a8f1..c036ee614415 100644
--- a/app-portage/flaggie/flaggie-0.99.3.ebuild
+++ b/app-portage/flaggie/flaggie-0.99.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}]
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index d6a2c31a8780..d710ca664313 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,6 +1,6 @@
 DIST metagen-0.7.3.tar.gz 9607 BLAKE2B 3c5b9debf10b0a6dda9bdf0e45e157c80019d0496d93f5af18e7be1b502c320fdbf7bd28f382e9021580d3aaa373566d7b342f3fa57f736fcb3676bafdd4d6e2 SHA512 d7293125685ad3be35dd9213b5d52c9219b6a5bcee4ab15fb2426bdccdb95b4df5567c2178bdefc0e75987080cd51026b5b089a4d4cf6402f455429d55d3a9e8
 EBUILD metagen-0.7.3-r1.ebuild 917 BLAKE2B 76d0e6f271f4d38229b8c7ea6f7b3c7aa5d71de0ca3a6d29bec8dbacfb4a3bf7431da13854e59cacdd978d82bee4703eb472ceb5d3eac861d86c9f30f5d1da52 SHA512 0bcfa1df1336adad24af6c701b0e8e95bf8398214bd179b15d329baa35bd17826bac94fb1aacf25d4f1d3a1bdf523f170f1fe61dbf5ad31ff8afc7f410ebbbf6
-EBUILD metagen-0.7.3-r2.ebuild 902 BLAKE2B fcf67cdd674b755821f313cb8d93a7b3ec1f0df707c6db052fcb461dbd79a4e41c7ecb3afab6118fa46fe77b9966533398530ec7429fa74f182f687376ce5e43 SHA512 f2e64769f9fbeff02b5da68c9e5be91c5992e9fa23bcd8dbd7524ae6aeebff5725998c76e61f67e7094a0176228c3b246f3cb9e1848de699fabeb4f3b79e7499
+EBUILD metagen-0.7.3-r2.ebuild 899 BLAKE2B 9d33b8c980dae96f6a694f4644b51b8832b2e5ef8d9e92b85e392b3bbbddb72c94eb22c47087bf47cb6f87d4c28c2dd29e3a11bc76ab0f2051d370aa18e5b7f4 SHA512 3ed3643eb354e5701ce2f8912c5237c65401aca45dc4cb7efecb928120f87f172c62bbfab7c5305a814254dd44c79c37c8fe77f2f1685c3a7a79948e79550c30
 EBUILD metagen-0.7.3.ebuild 907 BLAKE2B 557c3edebe919df0e67db6a975e8dc80ff19009fdf3562821ca51121192d801ce7b6934d02eb050415d703d8d46f9a7a3db71c7d90d8f22f192466760a5a27b7 SHA512 9d3786afe98798ecbc09578e08264f74e11bf5260271ac2c8fb5bbf294b21d293f46ed92109faa3b36aa6356d74a341d64670f25cb7aaa343a89eb602c1cd830
 EBUILD metagen-9999.ebuild 887 BLAKE2B 10d8ee1aeb44d19b7795b05ab8658d2c560f44c3d0e3f2c283b457368e9d20d80c2e195b436630a612c52052181a822cdc08554570d7d621e0d92e736a825632 SHA512 0806403189c4113cac684505b66725fdc3d6dcc3833b41d9ed454137a1e5604a0e53eb0004997f10648edcaafaaf14e7030e63743e5a5527ed059ab63e5cbf31
 MISC metadata.xml 320 BLAKE2B 4321891734786ba01e58321578aa81d5b67a974a24c743003a206c82762f3e8d0582f3f8177ce11b29eae18017d301d5a7b3a9e5048dda134077d66dfdbf3401 SHA512 842f0f4e3ee5e995d504c35bdd1aa00a9b923a916b7395edbfa9134190bc36afef608fb3967deb7d83be2467cc15ec3a677d6bcba5f3aa9c7920d9e9a8816f31
diff --git a/app-portage/metagen/metagen-0.7.3-r2.ebuild b/app-portage/metagen/metagen-0.7.3-r2.ebuild
index 436a7a9df46f..930c202fcc26 100644
--- a/app-portage/metagen/metagen-0.7.3-r2.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
index 7c89ae236ed5..0e2cd4ad7f1c 100644
--- a/app-portage/pkg-testing-tools/Manifest
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -1,5 +1,5 @@
 DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
 DIST pkg-testing-tools-0.1.2.gh.tar.gz 6180 BLAKE2B 7674573d165e8e04ef4555301bb15e6f3e7b6834096e4b9dcadf74bfc40dabcff5b694a323d6e1c62fa20d965be4f9f8c0b9459c5dacbd01f914669594aa15b4 SHA512 8d5933be8cd596089d4f8f5609d597330a1619b12f08049985b48519ecf10c3fd40971ee76b3bee793c082b8b96832aa2f5a2f6db8e1ca127a374986540e5ffc
 EBUILD pkg-testing-tools-0.1.0.ebuild 482 BLAKE2B 862126cbcbf8f6f46f1c7f639275b1896d3c06b1967c0242f31f56fa2a47dc80624957275fc3cba068adee356ac4b8fd878bb5ebac5150dcac293a8873d64a9c SHA512 d25f8e939978d9753f7d22793660b89aefcc784dac0a1615b3745e92e2ddf17aa8087296ae6f228be919fee098d2e3d70ae24c2a6c6da80fef3bef411346241a
-EBUILD pkg-testing-tools-0.1.2.ebuild 520 BLAKE2B ce2883a7fcf316b841cd6447f09e959196ab40fce6c3ffa2d5fc41d622f22547ff76cac2cbb743a2b262dcaada6a0d7f2f8cd5564a8f814c13a941476745e21b SHA512 5a41ee084a7b9ebc165daaf6afe37884d1f27a20856609a29aa18b6ffdd37b433c7604a97cd3c10d536b2d7a2b7a61c90e4689a8e13fb476f6432cd287a624b2
+EBUILD pkg-testing-tools-0.1.2.ebuild 518 BLAKE2B 7caa3978c5cb7cf644da0d9bca0a7ffaa9adaf8179246090f8bbf3dfac364359a6f06e01335b9a7d598c03e38f851bfe7fbf096db14e17393657533ea29cf9cb SHA512 ac4f272cfe87f3362cb20044304c8d11882f40c72d54ce0f0104aa1bcd72d62aae820eb5c7a273952190449f69b11b19a5d6946828398728391dc9fe7d2e5a9a
 MISC metadata.xml 346 BLAKE2B 3722dffc5927806f50a95438483030320544f0ba1c23dc286373bc801241416eb54269849de2fa9dbcd7921607f52baf63d6ee3dc509a5c1270895d9e8dbc450 SHA512 f41ac37cdfba066c194e16d89e2741a44388e8811cadd601811e858452c6c848dd5463b499a674f40c24250ee5aac98ba774fc227994f3ebca307700b6901377
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
index 7172c7fe5599..1edd199dcdfd 100644
--- a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d8baeeffa0d0..2ab1bf61884c 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest
index 3bd19f04dcc6..bbe1c091c789 100644
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@@ -1,3 +1,5 @@
 DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31
+DIST crengine-ng-0.9.8.tar.bz2 3407775 BLAKE2B f4e2c49ac0ee690f658f549e26bf29a61ec3c9fcb18b86ef3f7fb5d998560ecf99b61e08c438f9336dc0ec78bc3c22cb0753ef182a3e328c2734f54a9d37b324 SHA512 9cd234caddfe6cd651fbf4e2f2eb1ce143f21505a194af8e87bf79c41cd1082a4319383d47e2fcdd8aef22da2bf20f46b9db2a617fdcb4eb3e87982b2660094e
 EBUILD crengine-ng-0.9.7.ebuild 1602 BLAKE2B 64dadcb4c730cccd36a11285e1983bb8b6969789167c720b2bec44ba5957626022aaf5224b0042f1af0918ae21ce6760601fef7a40ff3870082accb4ed2d9c6e SHA512 07a3a323e8e642a443cb1428ad5e7eaa70a49b3dcba3423642bd06e5c603b0aa9af6d22e37ab1badbb641550c02dcbfa8c1991c1f18a4b7e20b41587cfeac3d0
+EBUILD crengine-ng-0.9.8.ebuild 1607 BLAKE2B 26aefcdc3bc6a740e982e9b0f999d5df1e0eba7e635ff76211398b643cff8a5a33f27043b800b153f5d5f015aeece65c982747317374bc599a62d15a26e12326 SHA512 a4caf3cd602f40a20aba13f9e4933b83efcbb1e7f1e0136e4892f4cc1334522d35031395714c629bcf2a4373e9cc672633d6854a5264556c8597c2b0abf39e86
 MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036
diff --git a/app-text/crengine-ng/crengine-ng-0.9.8.ebuild b/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
new file mode 100644
index 000000000000..6d121a24104c
--- /dev/null
+++ b/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
+
+CDEPEND="sys-libs/zlib
+	png? ( media-libs/libpng:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	>=media-libs/freetype-2.10.0
+	harfbuzz? ( media-libs/harfbuzz:= )
+	libunibreak? ( dev-libs/libunibreak:= )
+	fribidi? ( dev-libs/fribidi )
+	zstd? ( app-arch/zstd:= )
+	libutf8proc? ( dev-libs/libutf8proc:= )
+	fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	${CDEPEND}"
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DCRE_BUILD_SHARED=ON
+		-DCRE_BUILD_STATIC=$(usex static-libs)
+		-DUSE_COLOR_BACKBUFFER=ON
+		-DWITH_LIBPNG=$(usex png)
+		-DWITH_LIBJPEG=$(usex jpeg)
+		-DWITH_FREETYPE=ON
+		-DWITH_HARFBUZZ=$(usex harfbuzz)
+		-DWITH_LIBUNIBREAK=$(usex libunibreak)
+		-DWITH_FRIBIDI=$(usex fribidi)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_UTF8PROC=$(usex libutf8proc)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_NANOSVG=$(usex svg)
+		-DUSE_CHM=$(usex chm)
+		-DUSE_ANTIWORD=ON
+		-DUSE_FONTCONFIG=$(usex fontconfig)
+		-DUSE_SHASUM=OFF
+		-DBUILD_TOOLS=OFF
+		-DENABLE_UNITTESTING=OFF
+		-DENABLE_LTO=$(usex lto)
+	)
+	cmake_src_configure
+}
diff --git a/app-text/crqt-ng/Manifest b/app-text/crqt-ng/Manifest
index 229aa0674002..6a7679c7b611 100644
--- a/app-text/crqt-ng/Manifest
+++ b/app-text/crqt-ng/Manifest
@@ -1,5 +1,5 @@
 DIST crqt-ng-1.0.11.tar.bz2 442916 BLAKE2B 3eb4c73f1c3b3c88d92cb6ed5bf4895329caab1391c7be05dc0ccc1a65546f7761ee7af6246045be70137fd8683e2bfc5fb41df3dad604177ae4c0351f44c74e SHA512 62bb4b8a3dec3dd9fba5e1a2795f384e5310b87800d89e15b7f4fe258eb923481f1264ec23645b09f5ae89822e332d1499aeca0a79efab21124b43deec3ada44
 DIST crqt-ng-1.0.9.tar.bz2 435826 BLAKE2B 771b073fadf6f1bc9ddf7887603aaf6081d54c2effd548523f7afbb8b6bdf20d21bf55c1c37101662c2b851e932c6b4dce777c8e9160b059dbb1daed499db1c4 SHA512 b4f395be1d2029024dfb064f38db2ea372587151de1f5fae3cef492d4285d6ce597bc93a48d98594c5b703db8c99ba29cd9afdaae4c39b80b53cf6a7bafdbb97
-EBUILD crqt-ng-1.0.11.ebuild 1091 BLAKE2B 9f8aa2a9731bb1ad68771c14a54cce822e385be5351fad4daa1d33b3b8ec1f78d38b7f27fda89f64cbbacd861319cee99a3815b4464e37fb3e78447c711831a2 SHA512 d940c3f8bf0a8bd94ca81d30b65cad6a27453f42158c7511abafa0905cde07b98e26c26e1804e30b853d78f70a75b50649c6ea25f1f0b85e04dc2ceb4db8d445
+EBUILD crqt-ng-1.0.11-r1.ebuild 1094 BLAKE2B 494139b1428a262054ba697cf733ea1fa91be32c543b0f958d5e0ea8c8333ceb2ca7dd9aaa7ff432ed17ea074bae1dbd74edcc927800c825c58143db5edb43f6 SHA512 dc5f6847e384c9b418c371a5645210d6fcf6dd4038446a88e5a7361e94239b781d44aa7326ecc9dbf97f67db474a333a6e4b0a8d9c96c87fe5f65faf869f46a5
 EBUILD crqt-ng-1.0.9.ebuild 1085 BLAKE2B 83fe51d3d4725fe1353c5b9652535ed9ec0014db11835c61a97085508a69927370388ae9ec4da35196193e74f3c48eda5ad8fdda0b05267af73250e8080cbeff SHA512 78846eb89eec8dbaac7228fbb77f0a0e80143dc0369565d96e1f5569972997c565ca9a473b5e2a34325adf346f2edb78face6205e53a49e48992339424a066f2
 MISC metadata.xml 1177 BLAKE2B 0c28a5a4feb5c6dd5cb1115c063770bb276f2accff5c7a5e695b1492ae5cf3a188ceef2d5fb3519da87f6b68eff452f4f61b87f6ebd196b08cba55a26836047f SHA512 7cd49c422506be812eb080160286b21e0ecd48d6ae877e3bbea2ea8fd2ca0998e36c670db0e75c708a54c0b311b55fcadbfc1bf791e4c0c912c29b42ed6fcee4
diff --git a/app-text/crqt-ng/crqt-ng-1.0.11.ebuild b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
similarity index 89%
rename from app-text/crqt-ng/crqt-ng-1.0.11.ebuild
rename to app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
index c06677c451df..61940f927e92 100644
--- a/app-text/crqt-ng/crqt-ng-1.0.11.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
 
-CDEPEND=">=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5"
diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest
index 1e7f16a45d9e..50cdb9426f16 100644
--- a/app-text/crwx-ng/Manifest
+++ b/app-text/crwx-ng/Manifest
@@ -1,4 +1,4 @@
 AUX crwx-ng-0.2.0.patch 3504 BLAKE2B 4ba842f9961f57fcd86f6423232fc401f2af07a1b5b77213716519d5e2a29b156d8f304b126249f2336abe60b7ac8ce13921d9f58aff1ce4efa70fdb06537ce0 SHA512 5370b9111efc9db9f493fdead16245b1b03eccd7e178f3ec9df6765893c743879c23f56ee700794e4dbab2dc15186714e598db335fb5a624b5cd096d8814df40
 DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99
-EBUILD crwx-ng-0.2.0-r2.ebuild 700 BLAKE2B 4e80d8ea6377434b6f99a49ed8a95f7cdde613ab5f1793fbe2b330549ba37fecc6d8c8565da32c81f8c4419ec5af56cd37b01bd56a07592ac904d8b569077a8b SHA512 09cc9b248a4a7265270f37232292f6b20835182b86fb651a6117028dfc164acb34665c0b95fc51667f487aecfc67ab8c7f75a6ac31570b89717a35c20c749744
+EBUILD crwx-ng-0.2.0-r3.ebuild 704 BLAKE2B 721f91fdb3e1aa632c4b0bcf823db7edab03cdf4c6656d403868c2af8318032666427bc6edc8aa37489ce1c0bffcc615e981dad9f9a0e67c5f77a228aeca4f23 SHA512 c3b06e48e0416ed62ddd51d1680b2a4174b71e318250e4ea5c6215b95ca024ee4060bac7f7b862c7ea768c8515c7e4babb2608931b2710d78fab4414190e1d75
 MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7
diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
similarity index 81%
rename from app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
rename to app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
index c362c9d43f6d..64cec1b653a4 100644
--- a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
@@ -9,12 +9,12 @@ DESCRIPTION="Cross-platform e-book reader"
 HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
 SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"
 
-CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 BDEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 71ea8cfafc5d..0a5538d6a2e9 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,3 @@
 DIST gspell-1.12.0.tar.xz 433068 BLAKE2B 5726f40b07ee1d23a5a2e22ed012b52d6090a645b3141ecaf6a92cc850442be605ff2481a28ec87ee0d5b727b792fe2812a3e32ffd05978ed984d92b593910ec SHA512 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
-EBUILD gspell-1.12.0.ebuild 1532 BLAKE2B a116a9be865e6a3dd8685670d7a23a5eafad03981723669359b3e5cb72163bbad72cb3a43b8275523c627cad640c3ee9e71f96ee4312ab87ce3c2ce1a80bc475 SHA512 5cb3262e00633f28dc8a2abe6e484200c16fb7d32f91b67c66cc7b7870ce087da59b2b98d976bb56e448f3e2440e2da5d3873564cd6902bc2cf4469c3ab7ff8f
+EBUILD gspell-1.12.0.ebuild 1531 BLAKE2B 436884fb6e5ca361948e277666f99a227ae17a7ada92ac87cb3e5d6be7731ca5c92065024f40f244caaf8dcb48d0faf6d4370a0c1279c75c4538d23dabbaf78a SHA512 53af0ed05f2fde48d650e8a45310a79fa1e9484804c8e9b70291838f570ab95d388854188f4519659d9fb75913e6bbd756262d7425a75ddddbf6e44cc4c855b6
 MISC metadata.xml 347 BLAKE2B 3b91db6ff2ea521010e0437fc23b5f69567011240291483423ec748b70cf2baba234824c41cc493f8d30106dad208b9e4b376e69ca3d8e495072b97dd2f271de SHA512 4691f9bc67d5e5372945a4aa319185c4478b58e463c9c1b853a2503c80ab7dacebc433c8ffc247d0fce9e7b2f0f03fd4e0216d27e135598efa26e2988ac7bc73
diff --git a/app-text/gspell/gspell-1.12.0.ebuild b/app-text/gspell/gspell-1.12.0.ebuild
index 99217800bdd3..02282d452748 100644
--- a/app-text/gspell/gspell-1.12.0.ebuild
+++ b/app-text/gspell/gspell-1.12.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 34085b9bc757..f1638af3b885 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
-EBUILD highlight-4.1.ebuild 2419 BLAKE2B d73a27c1d6fee58f69fe23d75c847a0d87d154d08fd28baadd5002866e9ef59daf7b3cc076b93c34e8517ec22be1f04c84d7852f80d68b811dac5d1b17e21136 SHA512 e8f2cda8c3b8d58268c59ffa779039eb2976794d1f5886a72ca6adf047dcc1f1c7d87140c74a638a730d6f17d185ff1998e0df6e73c6c0ec5a2f60e6893798c3
+EBUILD highlight-4.1.ebuild 2423 BLAKE2B 812355e2acd16abd03cc4a6d5555f24af630cce614ffeebc4e4e525916f62a9b51ec1269667d6bd00c744e63ff4b74dbd5cc020307cd24ce12ab6780f1147f94 SHA512 975b17328a8fbe9659c49bd69ea0a1eef4015fa2c70f03d08ce2c5a2dc76252285e5534ea0618d9c3b0da5c0f3dd65206496b4d429c88d7798be500aaff8139e
 MISC metadata.xml 331 BLAKE2B 3c864f08058c451342b7f7799f36e901f392207b36114dd123bb3faa59f04fe3b00d8e65cee4ad3bbbe44606bdafbd246c64d5fce03cd54fc64cd40cfde59788 SHA512 eb96ee44971855de0b12f9e230d58714acb54de1b0a814c0681f8c31124a5c3e39290e2fd17523b2b52b65efaf30f64580f00777a8e9c908779b582577897906
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index e392371ce93d..9271ef7b7f6f 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single qmake-utils toolchain-funcs
+inherit lua-single qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
 HOMEPAGE="http://www.andre-simon.de/"
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 8e5ec5402587..0f540f59a42e 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -3,5 +3,5 @@ DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c
 DIST xapian-omega-1.4.22.tar.xz 570476 BLAKE2B 05bd5c8135870b3a2058bcd032da9609cac7d0b1a07b31cb84f8fdf175bb87d22acd9beb392f93ebf1f23e4ebf4d23fbe12b70063628d318012b71246d14f26b SHA512 460120fa2c76ad99f818f4183c4ded92eaa7f01a9dd782af1e93faf11caf2479053f45a9e9f0a602bf31631dba8be2d2c18bba28340c578126e8658ad4937c19
 EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
 EBUILD xapian-omega-1.4.21.ebuild 1183 BLAKE2B 6e849058fc6a2ce3510ee3c612f056563827a46136c0eff42e9c23981e480379c1ba2e234dab23a81919e7aeabc6a6436cfdad78b5b1fe28345d5207c6d1955f SHA512 78bff567e04d0119f4846f252583a94773410275858db84e13e5db52479a2ddc329b7d7d949eedca9ee0ab739759b6dd6ffdba1eb5c9999b2415ff817225d628
-EBUILD xapian-omega-1.4.22.ebuild 1170 BLAKE2B d0c6ebc4aba16496356c4a99577004940257b60285def0d87c55a601080a3780efd9ab09c85c0ce587324f66527bbd88909381814d775cd3afb0eb9dc669e817 SHA512 25ccf46c937820321eac3a8153fec8da9baac934663c1afe0b8a345aef3f9da95973fa8509a0e60b0fc11a5db442d9c10e37b9ca8f56e51e3c84e20680aa999a
+EBUILD xapian-omega-1.4.22.ebuild 1168 BLAKE2B 140933e2a67a55cc7a502cb4d6ba9827b74e71b55de01cc80ce158197487f9f3521045f8774420fe58caf942ecbeb533b39290bef986c3fb594844747f13f645 SHA512 ab84bd1eb8daf4d561fd3258cfd0f400c4909579dabc2e204739fa8558877f745463859c33a598ad218b6cd59eda0e9c2f70caa9f134ba1a9ac46247d4be5833
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
index a9a75d694991..24f037a0ec42 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.22.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	dev-lang/perl
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index e66c338a2878..181868ba402f 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,7 +1,7 @@
-DIST zotero-bin-6.0.22-amd64.tar.bz2 69278351 BLAKE2B 9f401ad27751fdb1cf8a156abae467c9a4e98214d816431103bf722d8c509e19593eb041af3d4cb516a26c6f6c7d9428609494a0daac302262ed0f32d10a515a SHA512 0de268da38b2b597a19a0bfceeca2e712b9b909f5210bac4fced76a3d84f7ede5028d441c3b4f48fc9eeb53bea003005e25056cabfa57b47449c6db74a04291c
-DIST zotero-bin-6.0.22-x86.tar.bz2 70934510 BLAKE2B b361b8a99616a7306e6de754871cc03141944fcdf30e76ce8ce5020d3e19efe066d2c093d96a190081f27728110d44168b2f87e80a3eb5c9bdac941d1708b391 SHA512 c0925a5163eb6aef6173a465598580c5c25a784a7bfcc288623ff35d3202255f4af40750e675c5c526929ecb3cfa4886707390d978580c2ed36aa2f02d195162
 DIST zotero-bin-6.0.23-amd64.tar.bz2 69289934 BLAKE2B a002cda6337c0e1145628abb277461bbb7efdb1d13f82ef24c60a44a6fb0b5231b6ef6b990b7a745ed018c8adefe38f62a9ccc3cbb8d03d28670a07e0a60e02e SHA512 4120ce16f00a81c6eb3037863f144fba8093bf5b261b6b5ec94f2e874eb4fdf3d08dc0df5607f8933f2e2257cd217364332f8a4366ea21ecce744dc4cace7a45
 DIST zotero-bin-6.0.23-x86.tar.bz2 70947747 BLAKE2B 47c5ff05ae41fbc1e75649a84af718dcac1cab65b1131529c903be29be9415e799d9465569901730bd55008d1e12502527fbb2c424ff9d386f5edb07c99bcbd7 SHA512 6e7d339f7ea56862fe0ba9501a4c3f671991d8e93e88c1e41d41141ad7e35ddf785ec4c4000267925f9276cab8c9e6dcfb92dcff19eec56a69e44ef1964d2c28
-EBUILD zotero-bin-6.0.22.ebuild 2123 BLAKE2B 002333800d6de75353c67b627a4c37eec438ed338f85ac2897591521e5fcacf36b195e9374130916ab351ca3e0b81468c54e144771200d68e2aeb0dbf0981d48 SHA512 a722774343d2628f4e008ccb344fef088225585ccc6217e88ce31d21f9e029925dc44c5b7d794df54659b1a0e1a227f944844625da299fa6e1f951ca09816db2
+DIST zotero-bin-6.0.25-amd64.tar.bz2 69360758 BLAKE2B e5ab5824397a28f476e37b41aff240c79365f3767653016c6e46777ab6e2d857e4a03e354a1b6a5b9985c3d42d30e78ebfc31f725af056eb6d53e4c40d98f28d SHA512 2d2622a2847cfde94d2b33e2630078086b5121bd953ef0940aa05a2280f1c3c191932c16bf8fe122349b23905e3ff444c36cb6db407e211408040dcfcaf8eef9
+DIST zotero-bin-6.0.25-x86.tar.bz2 71019373 BLAKE2B 0fb892141813774694956029b5ee3e716c623ac9f96a15e9ac429b066dd29206bc2a357330e9e2a0bac842be7fb228b9b7e440f373804654644a96cf962bccd3 SHA512 080535f72882ab32f2bc8050bcaa67f1b02796601be2b1dd5e1d4771c790105978f54b4e2d7a78c7e638f0268d26da60693953df13e2c964fdbb497f43cbbcd9
 EBUILD zotero-bin-6.0.23.ebuild 2123 BLAKE2B 002333800d6de75353c67b627a4c37eec438ed338f85ac2897591521e5fcacf36b195e9374130916ab351ca3e0b81468c54e144771200d68e2aeb0dbf0981d48 SHA512 a722774343d2628f4e008ccb344fef088225585ccc6217e88ce31d21f9e029925dc44c5b7d794df54659b1a0e1a227f944844625da299fa6e1f951ca09816db2
+EBUILD zotero-bin-6.0.25.ebuild 2123 BLAKE2B 002333800d6de75353c67b627a4c37eec438ed338f85ac2897591521e5fcacf36b195e9374130916ab351ca3e0b81468c54e144771200d68e2aeb0dbf0981d48 SHA512 a722774343d2628f4e008ccb344fef088225585ccc6217e88ce31d21f9e029925dc44c5b7d794df54659b1a0e1a227f944844625da299fa6e1f951ca09816db2
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-6.0.22.ebuild b/app-text/zotero-bin/zotero-bin-6.0.25.ebuild
similarity index 100%
rename from app-text/zotero-bin/zotero-bin-6.0.22.ebuild
rename to app-text/zotero-bin/zotero-bin-6.0.25.ebuild
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c0ec3e4b597f..6abd2c77d6c7 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index b567d59147e6..d95f6633ea89 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -7,10 +7,13 @@ AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b6
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
 DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2
+DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb
 EBUILD abseil-cpp-20200923.3.ebuild 2074 BLAKE2B 2bc37057007215ebab20cc3796b8d6baac54c607afe95fe7a05078dc16f029ae08c240fb443c95af0d274a68bfbc3133a279ba78589dba59548704acefd834c9 SHA512 e52bb7d9746fde48a6875ad42006727c36a6ddb7dfa3b37e593b039fbb840e3a40b74d54588ab405e9ac0a9a4edc1a1060e1534d07acc8b662b85b789bd9682d
 EBUILD abseil-cpp-20211102.0-r2.ebuild 1843 BLAKE2B 5c903bb664efc37c0177bf909f4543fa0ac4eb2f307137408391772aa7e518f67910140aaf74f2e1daa74fa0756692f4261297ca21ffcc4bbbbc6176cdf98863 SHA512 a3685940cbeada6195b52eb22d715752061d08c9eba52e8ae19f09f698c2dfe64ee5d17e03fb56e47fb88460e3e58682d4fb4fb65cdb7b8b5e236185b6eb87ca
 EBUILD abseil-cpp-20220623.1.ebuild 1693 BLAKE2B ea429df2acd8275402b7f2da010d17e6d5cd2894ab60f8debaba193c6dedfa8c297b7f6fede7587d68983525901ce19c3b6c2a90a34368d2480b18186aabc384 SHA512 6f6eb55ac69a254f40358458a9eebcfb1dd16dca3dde39d8fb12d894df9587ca3145542910cdbfa8d61616318ae9ef5cb4ee7f54eeb54068c392bf5d6b556a78
+EBUILD abseil-cpp-20230125.2.ebuild 1639 BLAKE2B af31537583693015bb5955f919c870ab88fe8206324e7482cb45d52089042fdea285977ebf3a208921c2eaed5e2ca1e3c535a700bd49fed55e0e006ac0143d91 SHA512 c11c8b8b4d8bb6e4e98412d743f9c3636a9f7c4988716852dfbf50bc20bf30b74b85c4a0814c127f269c26c06632b6bc17f4b9860a94bdd1665a0b4d5c310959
 MISC metadata.xml 439 BLAKE2B c4a87701635b1b903c2461acca126d15edb4f15cbb8dd9f353bcc71730c85478fd815e1f9c1f6ff8082360777a6e11042a01e417167c192b41f72b67e193d41f SHA512 16489f072408026da8f5da445185233f54a7c29761fa835a8388099acb8a6e3685e7db108fc4a3daa3430bcf6cb61d2e5d03c2e0e25d0f42f6da23e5dbcd134e
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
new file mode 100644
index 000000000000..2a7fb9e95c22
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+GTEST_COMMIT="v1.13.0"
+GTEST_FILE="gtest-${GTEST_COMMIT#v}.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT#v}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_CXX_STANDARD=17
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT#v}"
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		-DABSL_BUILD_TESTING=$(usex test ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests.
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index 7c76a69b72e1..564c61c8e9d8 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,9 +1,9 @@
-DIST cpp-httplib-0.11.3.tar.gz 633203 BLAKE2B 7418b958610a5f9fa634bd67622d176bdbb54a93c6478578ea0f9a9f1104b72923a8909702ae994edecc6e1f37d63ba09444913d44785e944426464df7c48cb1 SHA512 b0c46bf11c8bc84ab52143559ff1c4682b02504921855e5cd7e82bc65a04b192281ef7a124c7c7dfe928ae3842d5065097b6a4608be1c74dc51b563b15b93d0f
 DIST cpp-httplib-0.11.4.tar.gz 634929 BLAKE2B b6a6626de54e6828f08cd8f36934716969bc6c0485b8899522de2bd0c6b325c52c7541eccc095093062b4a3744b6170b10169d7e4a7a32a2cd683c292f9da85c SHA512 3f8a905cebee388526ebffeb431a90c9de2e8e92058ec0847f55fe0a43957ce6edaf093b3a516563d18d6105557af39270b9803865d400bbd849a60a5c8e8c17
 DIST cpp-httplib-0.12.0.tar.gz 635941 BLAKE2B b6f7d0d0be9da6afc4850313cd7508114463af7a94054b9495d069079120c3ca33d9e26865be538c0d002f1c31b88ec9cd7dd03d45ed620fbd851b0f19870eae SHA512 316ae9c2289d94cdd7dbd7ff70f056a54fba6ffdaf882b3e2c615e060ad8627e8a1b3fa452e6f30581859f9c7c6d919f47c2c98779401f4a92e1ce82188206fe
 DIST cpp-httplib-0.12.1.tar.gz 637858 BLAKE2B a4bc22f971e7dc011f172602f0579f09270eabad527dbba838df71908a6cbe66d432c8aef3a674ccbc3b39fbce477bc828afb5ec72b11f9ca2e0e77094b2d88e SHA512 a65ee9b4990572f92ade06fa6dc79535bc4d7c2bac47b85eba5e224fcb2d6dff7911127be72543b82a370628081acc81a88d1169a9cf30714f11c1227c40fe52
-EBUILD cpp-httplib-0.11.3.ebuild 1072 BLAKE2B 465523bfe5f4b175ecf7aaee78f5d174238661de3d42f7dc2a4ef3cf64daf71ded669b630add0973cd7eb338cef4578c8dac9a84c170e360b9948fd0ac3b4b96 SHA512 fddfbe66fc4d8d4cd4a09431ff27bcf306cf1ccb8f8965d8d5be6953bd99f235310bc3a12bd17c5712b5f88f9bee981a87b017303b53adb4407eea413c20c8e2
+DIST cpp-httplib-0.12.2.tar.gz 638460 BLAKE2B 91d039d39a43a73f052d63d0e1073350965bfa3b9653f0cab7d9353ed2d1acf91d2e3c20415f2a9398e64776baaedcb498b9de90046e785637de5382c41bb9ed SHA512 dda47f76eaf5b4daa35f1295e482f1d81dd8823ae06339b9f4c93e4fbe7b54ae28760d3083b5d5cff212f1a679616adfa47dbb9d06c6810fac4b58197f575429
 EBUILD cpp-httplib-0.11.4.ebuild 1346 BLAKE2B d0a866c23f8258c2a00eefb79d463100f7f4dbdaf83c786fa4d7ca2eaf45d361e6c297995fa6e89ab77e0a1aae3389a50ecbbd58e55d7d42a10e1ffede8ac9d3 SHA512 9441870620115100f50cc0d8b292c9e94540fd7a23c083ae7d070e5742a865f2a7e98f353e60d73070948e4dc11c5fa75010629f37df69bce6fc35a44edf0c50
-EBUILD cpp-httplib-0.12.0.ebuild 1297 BLAKE2B fcbd19ba11378072fa99a5c8184195ea53c3e816ebdca56abc634917a4ca094ddc6cdb9dd69be6bebab5b3ff7a28f5b6798bc22cbfdf6c845971ea1db08a813c SHA512 1922607bf9e9e76f1d7e3d5314030993b16e696da2c0ede95769b2d80583bcc5d670a200616d720e19554d38fcccf0c7cf1e564cfa22f20c5857868afd1f7b3d
-EBUILD cpp-httplib-0.12.1.ebuild 1297 BLAKE2B fcbd19ba11378072fa99a5c8184195ea53c3e816ebdca56abc634917a4ca094ddc6cdb9dd69be6bebab5b3ff7a28f5b6798bc22cbfdf6c845971ea1db08a813c SHA512 1922607bf9e9e76f1d7e3d5314030993b16e696da2c0ede95769b2d80583bcc5d670a200616d720e19554d38fcccf0c7cf1e564cfa22f20c5857868afd1f7b3d
+EBUILD cpp-httplib-0.12.0.ebuild 1307 BLAKE2B fea93d77fe60ec8d76fc0ea434dc1a8557c1f347adff8614a0ce8320ee04664dc49cc04666c0e9ca7be8ada8449c2f3c730affa7f913c0400e3a8290489a5505 SHA512 6ceb616dfef38b656bee3ece74711ded94b7316b8c77e55d7f2aadcc7fa1f64947fc0fdb208542d364bf510b003eb40aafdc6949c3a68984fa2e0315ea7ff366
+EBUILD cpp-httplib-0.12.1.ebuild 1307 BLAKE2B fea93d77fe60ec8d76fc0ea434dc1a8557c1f347adff8614a0ce8320ee04664dc49cc04666c0e9ca7be8ada8449c2f3c730affa7f913c0400e3a8290489a5505 SHA512 6ceb616dfef38b656bee3ece74711ded94b7316b8c77e55d7f2aadcc7fa1f64947fc0fdb208542d364bf510b003eb40aafdc6949c3a68984fa2e0315ea7ff366
+EBUILD cpp-httplib-0.12.2.ebuild 1315 BLAKE2B fdba99c8ecda5a9fda38f501bb844326574273b75e8e6fad5a69fff7c1e35574867d778b910be3f08c6f6b5d7141439f8a0d72f5083d2f8e3afd23eafe42a3fb SHA512 0205304ec89b3341ac3deab628ae08133358ef8d92cf0a5fb5f872f64145b4158b3ae1f05cd0694595414b69fab6a0b8ac7391c83d73aa6f5346491fe4cceb02
 MISC metadata.xml 744 BLAKE2B c3cbea51dafa4c3faa9ad130a2cb493ec87489a574dea464d884b15188c54bd60cb9e6dc30fa8f453bff041d374a3e9ff3f20a78580bdc8fad2bf26b0e3b3c90 SHA512 361401b649e07b2a4d577788d8552fc744271fa8e14e8a53083fa5aeea8a39f183eb6c736c941e10878ef24700a1e2a80201bc36ed646406586835cacdeee1a2
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
index b4b2e67701ea..8910a1019604 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/0.11"  # soversion
+SLOT="0/$(ver_cut 1-2)"  # soversion
 KEYWORDS="amd64 ~x86"
 
 IUSE="brotli ssl test zlib"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
index b4b2e67701ea..8910a1019604 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/0.11"  # soversion
+SLOT="0/$(ver_cut 1-2)"  # soversion
 KEYWORDS="amd64 ~x86"
 
 IUSE="brotli ssl test zlib"
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
similarity index 58%
rename from dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
rename to dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
index a24f0b6165e2..c9a985c777d7 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
@@ -3,18 +3,22 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="C++ HTTP/HTTPS server and client library"
-HOMEPAGE="https://github.com/yhirose/cpp-httplib"
-SRC_URI="https://github.com/yhirose/cpp-httplib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
+SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0/0.11" # soversion
-KEYWORDS="amd64 ~x86"
+SLOT="0/$(ver_cut 1-2)"  # soversion
+KEYWORDS="~amd64 ~loong ~x86"
 
-IUSE="brotli ssl zlib"
+IUSE="brotli ssl test zlib"
+REQUIRED_USE="test? ( brotli ssl zlib )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
@@ -25,7 +29,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
 src_configure() {
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		-DHTTPLIB_COMPILE=yes
 		-DBUILD_SHARED_LIBS=yes
 		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
@@ -38,3 +42,9 @@ src_configure() {
 	)
 	cmake-multilib_src_configure
 }
+
+multilib_src_test() {
+	cp -p -R --reflink=auto "${S}/test" ./test || die
+
+	emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
+}
diff --git a/dev-cpp/json11/Manifest b/dev-cpp/json11/Manifest
index e4a159844fa8..219248479065 100644
--- a/dev-cpp/json11/Manifest
+++ b/dev-cpp/json11/Manifest
@@ -2,5 +2,4 @@ AUX json11-1.0.0-fix-multiarch-install.patch 786 BLAKE2B 5362fce55049ed95f0de546
 AUX json11-1.0.0-json11.pc-do-not-state-the-defaults.patch 728 BLAKE2B d96a4a9b0cf5aece5c07181eff4a246c792afb431d1c35715e1c587811108cfef04dc19bbf7fdcb84ac0e5a289ef6697e2e468ef2dc8f190d38ffead8e6d2768 SHA512 98079b0266d30364e47622e58d8d203ef16296aa40c01e318cd7fd902b8d8adcca5c2cae0d09d203137cc219e9288fa7a1187fc8f8fedd4a1ecc68ebd73688e3
 DIST json11-1.0.0.tar.gz 13104 BLAKE2B 9f4fef741b40f1d163dd96555a521b6220c47402624baa5446fb94592989a830a0c511162a6af64b76962c8b07b83a324845dc61c1ca91bbb99e2b0511fb962a SHA512 c49aa9ebc75199528a13cd255d9362acb797d73a17fd69fb22673e945b8719a3d70fdf2d886fed342ca13ed1b4ea578534520d87c46c4a418929f9124aee3ec3
 EBUILD json11-1.0.0-r1.ebuild 483 BLAKE2B 9ecd56a77aaf7cc7e116c877838fe84ddd8ac4d1b571a4802f97b74f29d74c78108a7540d0b16977f043f37bb2588d66ff3cb0b38320e6b7c7fe0a998499d114 SHA512 fb72bff069e37ae1ebb37f86cb88aaba7e7016c7d0eb162cabbd23fd8b0c297421790c14677fd5f9f35894a100dd75cfd43a4c2cfd6a04136bf1e769fe9fd0c7
-EBUILD json11-1.0.0.ebuild 409 BLAKE2B b0a2e5398ff074d307e0d5715882d89284014679e4b9af332b1e9da2375c08b73229e50513a416ba87c018d63b4fba8c9dacf31baec5cdf1c93c70637dbae222 SHA512 e8c58cfc6a0f404a0f0bceef42420b1e2762913110fe018fc8979e648d7a9ff86b9f26b24fb83b2139d82a303d29282511f5f1a66969eebaa847c09b6c73cb80
 MISC metadata.xml 326 BLAKE2B de17355ea68ddbed46fa6e2a41ef90ce0d810757f6974f40773dbb547723ef0664d145dc0718d4c01aaf6f569f32bb298e70f5faccadbd00f283304d4c3308aa SHA512 7e02afef76ec6bac01baead08ae25fd11355197abe23162eb41a055c6de8b1643d5a958b93ab39f87377ad166bfb7441a9aa24f21b382511a13a4ab8624056e6
diff --git a/dev-cpp/json11/json11-1.0.0.ebuild b/dev-cpp/json11/json11-1.0.0.ebuild
deleted file mode 100644
index a7da588e277d..000000000000
--- a/dev-cpp/json11/json11-1.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A tiny JSON library for C++11"
-HOMEPAGE="https://github.com/dropbox/json11"
-SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-multiarch-install.patch
-)
diff --git a/dev-cpp/msgpack-cxx/Manifest b/dev-cpp/msgpack-cxx/Manifest
index e7904b6f31b3..404b56884ce1 100644
--- a/dev-cpp/msgpack-cxx/Manifest
+++ b/dev-cpp/msgpack-cxx/Manifest
@@ -1,5 +1,6 @@
+AUX msgpack-cxx-6.0.0-gcc13.patch 1516 BLAKE2B b6da40e88b4e90cba6cdff1c68d8cb6ca2dae43bdf328afa1f6bfcc55d7e557e270f550d126dbacbda8e07d1b62e916dc7ff9864ec4179d08c14bc594d710ae7 SHA512 72a52401e2a1834243eac124c7dd5d8b958772d40586ad84012c691b71e6881526eeba1cbc8e2df58da3a4f83549c59a0b43d39b470f39351f772ae1a72914d2
 DIST msgpack-cxx-5.0.0.tar.gz 476103 BLAKE2B e631a47e8d39b6ad9c2dd5e782fbbd5044c177e18c619fb52d1293e2c5f2ea7e766e7b26ce6cac36a2ff98217143e12456e0541992afb4f78597ffd3852f2acf SHA512 5ee0237eb1bf05bd4becad32ab145a8f0654f8f0e2e3452331ed3df088cda03ee4cdf1557ba867447e3e18baed924c105c76934f7009dac98b6dc69282c39d0c
 DIST msgpack-cxx-6.0.0.tar.gz 476132 BLAKE2B 89b6505511bd8f6994a2e61661c7a33bd1aa68804c081ec2fcaf074f845caf4338ac362916af9fb0bab7285b0d0508c74b229316fa75ef8083546ac84c4ca95d SHA512 90f89216676af5a656d570fbff5a716d1177fa1941b0a928b2da20e0b6cd6d0ca880b7369e085dbbca944499c05694a73df919042d8cd78498ed4b34b77a0e9d
 EBUILD msgpack-cxx-5.0.0.ebuild 1222 BLAKE2B 9842e077f4ef2e9272c68bddf4ea8df88fee05b03ec8a0af56bf52f9daf9cbd98d25e1cbee0e85d1e4429d61cb6c2827f802a6f219a2f759936f20b3fbbf71f4 SHA512 7ce8208c9d271eef22e38214932dbe5d29b14209aeacca536abf4bd77eba046e0ce113eda56299e1987e9be927048a0bdaeb18a9357fc79ab496736aa1854c67
-EBUILD msgpack-cxx-6.0.0.ebuild 1222 BLAKE2B 9842e077f4ef2e9272c68bddf4ea8df88fee05b03ec8a0af56bf52f9daf9cbd98d25e1cbee0e85d1e4429d61cb6c2827f802a6f219a2f759936f20b3fbbf71f4 SHA512 7ce8208c9d271eef22e38214932dbe5d29b14209aeacca536abf4bd77eba046e0ce113eda56299e1987e9be927048a0bdaeb18a9357fc79ab496736aa1854c67
+EBUILD msgpack-cxx-6.0.0.ebuild 1276 BLAKE2B 6871c1c5aa559c85a00c870fbff7d8ab35abecd4aeea0b5b14f3338c14dbee2fb3c3391e2fd6c5be47b652a7cc01e10d46d6b24eaddea2fba49e4b4cd8616b35 SHA512 b9c14ef7301e1df5124f5745174767f2c1d6f5f693b9331ca9468ea2e38a4ed635f94e58c09c6557bef9fda2c5dc93756fbf56732980166650cc4131198861e1
 MISC metadata.xml 410 BLAKE2B 2d8ac30a8aa745f32a388a0d66860d2af8de8bdc0e558b713738def49ec87e96b5ee201c4b2cd01f43f213ffd9f107cfcf9679725637f43ec7eed707ada87c69 SHA512 2009980f9bd56a3932a9f0ce56745439c0d29241bc11f3b8c0b2e26fc5a3f74ef9c7784165ed25e6280de4d1ee27e57ff225a5986522e51f50cc03e793625b4a
diff --git a/dev-cpp/msgpack-cxx/files/msgpack-cxx-6.0.0-gcc13.patch b/dev-cpp/msgpack-cxx/files/msgpack-cxx-6.0.0-gcc13.patch
new file mode 100644
index 000000000000..3e0b67675e2d
--- /dev/null
+++ b/dev-cpp/msgpack-cxx/files/msgpack-cxx-6.0.0-gcc13.patch
@@ -0,0 +1,49 @@
+From 2dd3dbc85f5c3ab789792844e50f7423bdb1d3f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org>
+Date: Tue, 18 Apr 2023 15:50:52 +0200
+Subject: [PATCH] test: Add missing rebind to allocators
+
+See https://gcc.gnu.org/gcc-13/porting_to.html
+---
+https://github.com/msgpack/msgpack-c/pull/1065
+
+ test/msgpack_cpp11.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/test/msgpack_cpp11.cpp b/test/msgpack_cpp11.cpp
+index 2a856cb8..6b04e5a1 100644
+--- a/test/msgpack_cpp11.cpp
++++ b/test/msgpack_cpp11.cpp
+@@ -252,6 +252,9 @@ struct equal_to : std::equal_to<Key> {
+ template <class Key>
+ struct set_allocator : std::allocator<Key> {
+     using std::allocator<Key>::allocator;
++
++    template<class U>
++    struct rebind { using other = set_allocator<U>; };
+ };
+ 
+ // C++ named requirement Allocator implies that the first template type
+@@ -262,6 +265,9 @@ struct set_allocator : std::allocator<Key> {
+ template <typename KeyValuePair>
+ struct map_allocator_impl : std::allocator<KeyValuePair> {
+     using std::allocator<KeyValuePair>::allocator;
++
++    template<class U>
++    struct rebind { using other = map_allocator_impl<U>; };
+ };
+ 
+ template <class Key, class T>
+@@ -270,6 +276,9 @@ using map_allocator = map_allocator_impl<std::pair<const Key, T>>;
+ template <class T>
+ struct allocator : std::allocator<T> {
+     using std::allocator<T>::allocator;
++
++    template<class U>
++    struct rebind { using other = allocator<U>; };
+ };
+ 
+ } // namespace test
+-- 
+2.40.0
+
diff --git a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
index 8e3609f7d111..d28443c3f1fa 100644
--- a/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
+++ b/dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
@@ -24,6 +24,10 @@ DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )
 	test? ( sys-libs/zlib )"
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-6.0.0-gcc13.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DMSGPACK_BUILD_EXAMPLES=OFF
diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest
index bda39f8bbeff..e3844edbc2fc 100644
--- a/dev-cpp/rapidfuzz-cpp/Manifest
+++ b/dev-cpp/rapidfuzz-cpp/Manifest
@@ -3,8 +3,10 @@ DIST rapidfuzz-cpp-1.10.1.gh.tar.gz 284749 BLAKE2B 530476df0120e0a864298f80d786d
 DIST rapidfuzz-cpp-1.10.2.gh.tar.gz 284978 BLAKE2B 5d2ef555ce2af009d4bb2fbf3e649e6cfc43ab3b20497d8e00c3f99d23173faf3425be4fcaec78820c969a336bb4255e6f680482aba657e838ecc4194e92db01 SHA512 65198df529005264ef94cb308eb09d6569ea805f46fbd42e6fedd18ac949722ff10ed30fbc41aaa986d790566168ff46c2b03ec5f7b6041b2f3e522e534f2ee2
 DIST rapidfuzz-cpp-1.10.4.gh.tar.gz 283916 BLAKE2B e0c3890628dd9303ff7d67d83df5a53f0466ccefd37fca6e56aa8613abc09fc16523e677cee3061425b2bd7720e5c6b26d43f51556ec7b1ef6d48583a1055a9e SHA512 11dfd3b5f869eaf11edcb2c075709416645c89ab6057dbcaf12eb5defd609c33e792265b131942f22e3e2661f8c00a653e23a83eb2ba4bd8c82a7d16960d3b3b
 DIST rapidfuzz-cpp-1.11.2.gh.tar.gz 285371 BLAKE2B c4ac8907f70dbb4718c30e58acca54938a5e53ff7af916a754ec77e353fe628e6db13576c195b35560913410399470cf0f78a23c0e691591786128f0f0ee0d11 SHA512 80ae15a6a3d75679a992d2bfd48de318ec9349cf972adfb94a1d1061e9a8af5e6ed354a1ae7c4cd6b2bb8af8b5382dd07c2be71cf7bb9e064a8f3a568139618f
+DIST rapidfuzz-cpp-1.11.3.gh.tar.gz 285399 BLAKE2B cc2aeda5e519481d718917738a62fb6747514f4fd4cf2d5a9399c4d3b0192e37f4d8e0ec3578bc84cfaba99f8644f13d1fa8af93629615c20f2d28e4507a4d4f SHA512 a27c26021e49b3b8aa0cf73947ce5696b00e32c94fedb00d8d97b4dcb76ebbf107df1813dc479a9bd26942c09577d0bb84b3aea3398f7d750ecd68de4486996c
 EBUILD rapidfuzz-cpp-1.10.1.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
 EBUILD rapidfuzz-cpp-1.10.2.ebuild 880 BLAKE2B 75a820e8e2e2fc095a96484d8c29d92293753b935224c38ee9466352927e86ba44c82396499ee854a088319a6982ad7f4713b645284725e1a785868d2c3b4047 SHA512 d40a32b45dc55e35871e5e79b307848da4fcc28bcceab5a70acbf47444a81041ec933966dafc7d8c5b13a00ad1db091ebef8d3fdf206a5e88a05e73d02d0efb0
 EBUILD rapidfuzz-cpp-1.10.4.ebuild 628 BLAKE2B a993450d45d526bb6aa07da65c5e94c1190957fae52697814e080e5598033b911e31a7eb9cea0f4e78a4b67600081f6f2a520fa51b93bb54600b891d096ad899 SHA512 3c58dad5b361e8dce1e79eafbe6906f14d71a35fc9b5ca3f823aba70cae1c204bb0390acc15ea6b56db681e950feca340b754ab3cc83f59d3c129f8850647816
 EBUILD rapidfuzz-cpp-1.11.2.ebuild 688 BLAKE2B 5e192f101867eb5c6850886749be0d28e189a746ec030902057c63cfc5018649bce3ba12b35bd7dc751706ffaa53af40a971aecf7cd85829a8e50c0626f7ed84 SHA512 2e831c09151fd0ab5d95601aab3a48de771033c3e9e185761b00c682b79d39b7e6c32ac7c1795d1698b412fae498c7751574819bf35d218cfcce1bfaae8c2732
+EBUILD rapidfuzz-cpp-1.11.3.ebuild 635 BLAKE2B 3d3607829170ab7378c2dcd07c03fc627a7ef70e37f08a8c1422582d28595f0af4c1bd1dc6f2541f2c0b3a08404b9ed38d7409049b7ea4bb6831010113792774 SHA512 c04bcc0b71201c8f863539a1be779c950e08eebc297281206763c9d012e985c10bb2d5173252202e3fdb63277f26d6bbb754ac4c7b961cb1689151952ed8c406
 MISC metadata.xml 338 BLAKE2B 43c0cb99a03961ca48146b237a22fbf56c90312b7a39b57a3d01dd532f4f01891e713c802b372b4efb0af528198d8f2c0febae6ffec65da152e8e23f7a67b8a4 SHA512 a54d78c951d15319a2e467dc5d5692d9af5ef9e79c9c9135ee5e26853361ec6bcfebab8e82e3299314f9b7c8cd703365ff6d144e7e6876f486ca5f3a02a3b0f7
diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
new file mode 100644
index 000000000000..315024591a2e
--- /dev/null
+++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Rapid fuzzy string matching in C++"
+HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/"
+SRC_URI="
+	https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-3
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DRAPIDFUZZ_BUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1dd76400157d..b54f38f9d299 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 20807db8072b..ffac5802fc99 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -24,10 +24,11 @@ AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
-DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
+DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
+DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
 DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
 EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B 6c90fd8a69ac3aae5054bd0fd13b996b24eb14e891ffec618be02eddcc94eec3edb534b83383c813bf62aab680d4e5f38760c279b0a101b47dc99a3cde6db924 SHA512 506996d9c9aec1cd427dd6304a387a157bb31b2c84e14dd8a9699e21a9e8ba1e2c4c6ff0bae064230661c49ee1b5ed2ece42a8239fff4a7af15b26a684b3a523
-EBUILD mongodb-4.4.8-r1.ebuild 4898 BLAKE2B db6747805ff1ceed1c78abf0fcc353a1bd37e5a4cb98cd96aa159c3ebf5079ba1f5c73ffadb300152a91ed5ddd00ff93de1e57d60a576d5d8e002a1269baf18c SHA512 74727dbc719f2d789df571fca64f5bc1ee5bdd1d62bfa65bcaddf1585f4112e63d7d5d0621d63dfb21816278b058e8bdaf0c559eb16616d676f0d19ec13768ed
-EBUILD mongodb-4.4.8-r2.ebuild 4958 BLAKE2B e1d8b1be3dd9ebb4982411d3d6b5d044fa68272cef93db862b9cd38916900e6669be594bc3afcdc95b0ae9b86874a0e53fba8c9203d8251888324a58700549b2 SHA512 82f7349459a7a7de567139fe63f3fe088129a6940cda1f0334e1d160ed0f1df0f7e7fd9a232b4903c4ed4215538b4c8678cef29674839b64aac606d37730f295
+EBUILD mongodb-4.4.20.ebuild 5164 BLAKE2B 8f43abb00740a5612a902fc12c35768c4cc81042a483cb86f98f2c7eec35c7869084f8c8008ff66c410794fb02bf8f4c4dddecd165e7b3d975130995464a38c8 SHA512 f3392dcbc48043f0a1e9454a269e8d97b485bdac490aeab1d1ab3711f319c444803e1df3b39dde7c230ecdce05bc627878bfd4f29decb32708dcbcbb4e2beeae
+EBUILD mongodb-5.0.16-r1.ebuild 5558 BLAKE2B 089d0da6b99e825eaec8a884dd38d41888a8f040034fd61ae47366603924f0b5cb0b5da3fbf0dbf715b2e8efe2f57924cdb1f1b7184058ea770109b001c2222d SHA512 e56bf78fa82a9eb0dc28c27ac6faa9db29ea2bd4f5871d6a4fc63e617ad7d2602d879aaf45eb4f9106645f77c0ef335624d08d4d2848850057a75a026ed3bf1b
 EBUILD mongodb-5.0.5-r2.ebuild 5305 BLAKE2B 0a9abf9575ecf1ee0cec238a4e352560e4067cf5e9ddc39fa4ea94a7c89b3dc25abcde414d27220c220044cd7c58df0f38580ec0a494e5e5d6b1ae217dd9fe21 SHA512 d2f807ce50f107706f426d0b51a6d189084779eacc8c7b5c8122b841d922ed03b337ed23beb2af49dd92f16e7d8dcb7c5e7aa477ac531413ba2346d7409a61e4
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild
similarity index 93%
rename from dev-db/mongodb/mongodb-4.4.8-r2.ebuild
rename to dev-db/mongodb/mongodb-4.4.20.ebuild
index 7489f6bcd105..d99084f668e5 100644
--- a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_{9..11} )
 
 SCONS_MIN_VERSION="3.3.1"
 CHECKREQS_DISK_BUILD="2400M"
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
+KEYWORDS="~amd64 ~arm64 -riscv"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
@@ -59,8 +59,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
 	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
-	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+	"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
+	"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
+	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -104,6 +105,7 @@ src_configure() {
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
 	scons_opts=(
+		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
 
@@ -123,6 +125,10 @@ src_configure() {
 	use lto && scons_opts+=( --lto=on )
 	use ssl && scons_opts+=( --ssl )
 
+	# Needed to avoid forcing FORTIFY_SOURCE
+	# Gentoo's toolchain applies these anyway
+	scons_opts+=( --runtime-hardening=off )
+
 	# respect mongoDB upstream's basic recommendations
 	# see bug #536688 and #526114
 	if ! use debug; then
diff --git a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
similarity index 65%
rename from dev-db/mongodb/mongodb-4.4.8-r1.ebuild
rename to dev-db/mongodb/mongodb-5.0.16-r1.ebuild
index 7485b54678b2..2393d1783b1d 100644
--- a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_{9..11} )
 
 SCONS_MIN_VERSION="3.3.1"
 CHECKREQS_DISK_BUILD="2400M"
@@ -20,9 +20,13 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm64 -riscv"
+CPU_FLAGS="cpu_flags_x86_avx"
+IUSE="debug kerberos lto mongosh ssl +tools ${CPU_FLAGS}"
+
+# https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
+# resmoke needs python packages not yet present in Gentoo
+RESTRICT="test"
 
 RDEPEND="acct-group/mongodb
 	acct-user/mongodb
@@ -45,31 +49,34 @@ DEPEND="${RDEPEND}
 	debug? ( dev-util/valgrind )"
 BDEPEND="
 	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
 		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
 		dev-python/cheetah3[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
 "
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
+PDEPEND="
+	mongosh? ( app-admin/mongosh-bin )
+	tools? ( >=app-admin/mongo-tools-100 )
+"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
 	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+	"${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
+	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
+	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
+	"${FILESDIR}/${PN}-5.0.2-boost-1.79.patch"
+	"${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
+	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
+	"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
+	"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
 
 python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
-		python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
-	fi
-
 	python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
 	python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
 	python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
@@ -77,13 +84,21 @@ python_check_deps() {
 }
 
 pkg_pretend() {
+	# Bug 809692 + 890294
+	if use amd64 && ! use cpu_flags_x86_avx; then
+		ewarn "MongoDB 5.0 requires use of the AVX instruction set."
+		ewarn "This ebuild will use --experimental-optimization=-sandybridge which"
+        ewarn "will result in an experimental build of MongoDB as per upstream."
+		ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/"
+	fi
+
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
-			ewarn "To upgrade from a version earlier than the 4.2-series, you must"
+		if ver_test "$REPLACING_VERSIONS" -lt 4.4; then
+			ewarn "To upgrade from a version earlier than the 4.4-series, you must"
 			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.2-series. Then upgrade to 4.4 series."
+			ewarn "to 4.4-series. Then upgrade to 5.0 series."
 		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
+			ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading."
 		fi
 	fi
 }
@@ -92,7 +107,7 @@ src_prepare() {
 	default
 
 	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+	rm -r src/third_party/{boost,pcre-*,snappy-*,yaml-cpp,zlib-*} || die
 
 	# remove compass
 	rm -r src/mongo/installer/compass || die
@@ -103,10 +118,12 @@ src_configure() {
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
 	scons_opts=(
+		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
 
 		--disable-warnings-as-errors
+		--jobs="$(makeopts_jobs)"
 		--use-system-boost
 		--use-system-pcre
 		--use-system-snappy
@@ -120,7 +137,13 @@ src_configure() {
 	use debug && scons_opts+=( --dbg=on )
 	use kerberos && scons_opts+=( --use-sasl-client )
 	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
+    use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294
+
+	scons_opts+=( --ssl=$(usex ssl on off) )
+
+	# Needed to avoid forcing FORTIFY_SOURCE
+	# Gentoo's toolchain applies these anyway
+	scons_opts+=( --runtime-hardening=off )
 
 	# respect mongoDB upstream's basic recommendations
 	# see bug #536688 and #526114
@@ -133,13 +156,7 @@ src_configure() {
 }
 
 src_compile() {
-	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	ewarn "Tests may hang with FEATURES=usersandbox"
-	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+	PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die
 }
 
 src_install() {
@@ -157,7 +174,7 @@ src_install() {
 	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
 	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
 
-	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
 
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index ea388cffdd29..605ca3557996 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -12,7 +12,7 @@ DIST percona-xtrabackup-2.4.24.tar.gz 61985764 BLAKE2B 99531853b7e125bfe1d133d3d
 DIST percona-xtrabackup-8.0.26-18.tar.gz 294169182 BLAKE2B 250437badd9bcaea92b0f254fad27a775014f17215e764114bba3d1cf0882135127738a4db78349cb9d519e6a9b5bc015f04747ad8ebfc09245ebad3aa890400 SHA512 0cceb6758364c31167ef0b47176e1950273e80e5266b91e12353287dfae6e3a87382b29a466920e5e58add1f461295199a70bb070a225458ed8a7de844e012ea
 DIST percona-xtrabackup-8.0.30-23.tar.gz 338259133 BLAKE2B 3b73731497013aea6abae7d83cd96914cb5300dd867f6066514c71d68f8a1420227e33512a5f2faf082029ccd2c871394acbf43fb58c029472cbeb5605f354fc SHA512 acada88f3509526259281b7f9805fcabb31c5924eb50c5ed761b0813f89adda046b060a57825b6a49178171daec8b4388e99202ef9c9def4b2b0932e73b4d535
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
-EBUILD percona-xtrabackup-2.4.24.ebuild 1499 BLAKE2B f83871d1c9e600f7271f8f3166f2e7f17fabc36cf74f42088bd21cf2ffa8088b1b9d60097e966831d050e70ac9a5c8f4274bc96e6005d1076edfc4336b199680 SHA512 3823f3363fbeae66c1d1cc0b656d852c89c4a8b15bd3e77ba087509686775b6a2d1ee3ca73d297401a9a3778cb7261287b1d6af8c3d7288bcf7b55e34406c3da
+EBUILD percona-xtrabackup-2.4.24.ebuild 1497 BLAKE2B 0ccabaad902b71162d3982715b54aa29fc0f613f84caa1a9d1e6ab62179c812eb76468e4b902b79b22b7f1904a5cec996d6fff01abfcd21aa69010667f8f6bde SHA512 208ee2e1552be309d19198c3f082eb280a0bcc206e646cfe772ea3c13a4dba730754d5197c3db81b29eaa77d9521eceb9406c3c6600535ba09e6057b8a9820d7
 EBUILD percona-xtrabackup-8.0.26.18.ebuild 2143 BLAKE2B 1012824a0f32fe224136ea4d7d81bf32860d87858782e1b79f9f1ff23440c6af7f5a3fa85ddc1313337f0ae8dac66b6c40408b7123ef603f5a84f7c40a215c7c SHA512 f8affa196838fa9eec59ee1674d9a57aa7f97eaed4d4374b83d4c54b82cee0859ec4c0c95326a9f689ad850761e5adca3c1fbdfa107ccad04bdd06cc6df4d2f0
-EBUILD percona-xtrabackup-8.0.30.23.ebuild 2567 BLAKE2B 95651e8575912533ff177dca7e8f3c26d2dc2dfec92c8ab910930a33a59c1180217adbef5ab13457afd910c4a031b56a7f8630b647aacbc6b38608a8376bc534 SHA512 a0100d1b09df958ee8590415e9bef67346444779762d7ca63cd0a393c382ce40c1dbbf44231776e603409c4f4a4e116d5195eb76bf599813019bd41a691d04c1
+EBUILD percona-xtrabackup-8.0.30.23.ebuild 2565 BLAKE2B 78644689570217599cd2ecc3f3d52d4b0a7c25880da3a88dc1f7f81235c71d570f789dc4b751117f5f1295eae1520ad0526121d91f302492d6419637d2fdff5a SHA512 bf36a5888ad62c3d4563cb78d6fe080de272cccb10ed1975854cb3883c42b347e9e754a567913356d8472ad8a47965c0110f52203d75a93a6fa09990ff4a147d
 MISC metadata.xml 335 BLAKE2B a386be8de6b73711ec13028e9853bd5a7a75415e5eedf1c90a5a04766a26a7a8c7d1c356701633a9ab8ffc3c7a2337ff96642e54362e82c991b32a04890861e2 SHA512 e326d9546114704346381eedcad049a75d2ba787291c04815e175d9042869b2e0486750027c9d365ed62c043c5347ccbd254da24264693769ad6c122d9f62d0e
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
index 0a907e2e0f33..afba247aad2b 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -14,7 +14,7 @@ SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBa
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-arch/lz4:0=
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
index 7c1066f1f22d..c75845fa0b49 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-arch/lz4:0=
diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 92dd8221939b..29aec55e7312 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -3,7 +3,7 @@ DIST sqlmap-1.7.2.gh.tar.gz 7208613 BLAKE2B 69c8f6ba75b884ef13a693857a864df973a7
 DIST sqlmap-1.7.3.gh.tar.gz 7210615 BLAKE2B b20f95f8426a0ac1f4cbd09974bac5132b97b19227be036c2d290e121084e3841d80771834631cb2120f5968541e05ce9496abf317f208c759bd9bc8af396a9d SHA512 4e372ec66c104de01324355a5c7383373f9756057381d77ceaabc673c3d9f1e03b7aa253dd14f32f322926ddbd542401fa2ce65c4fc29dd37772901ea58a3813
 DIST sqlmap-1.7.4.gh.tar.gz 7213833 BLAKE2B 888d1756c92d44ac7ea746aea2bb3017ae81ada266a9534838f453e66be88930e695266e9f8673a4e673b1fcc61515f8d72e834d077bd66df244fd6bf5e20d52 SHA512 01446720f8b8c5b962a5a8f3b67228f1f9e145ac8736b005a4d825c30088667f4b307332d2baa4e8d4d4cbb8b96be00d2006f81f2892bb694c7d9dbf317721c0
 EBUILD sqlmap-1.7.2.ebuild 1332 BLAKE2B bd60bc7189d811d3e3b847750ec6e8981e04f495b98b601e6bb645ff5addb9e548bb8a064ef003540c367e9b262e529019255594409f71174c5588b11e2a3cf6 SHA512 6617f419f3591f314cf1fdd1bc44ee1c9de3580167c428a9484a686e8616fab489c2a579f94bf20ba87c5aa8437a943e0096a9541b4a1510f0e09768de9cabf5
-EBUILD sqlmap-1.7.3.ebuild 1334 BLAKE2B 1fe71c950c682821addd140f103e63a519908b3f7edba932bb8191dff577e5c6d378cf17acddc8cbdd81aefff91102d916df6a7f76488164b17e9705ec64a721 SHA512 a6e6b2878f4b63bdb10c7e98937074cef23bedce9220a985ed4e021354ea213651334cc650640995c27edcdccbda184f0d5570edea3f6fe5945b63f0e94551da
+EBUILD sqlmap-1.7.3.ebuild 1332 BLAKE2B bd60bc7189d811d3e3b847750ec6e8981e04f495b98b601e6bb645ff5addb9e548bb8a064ef003540c367e9b262e529019255594409f71174c5588b11e2a3cf6 SHA512 6617f419f3591f314cf1fdd1bc44ee1c9de3580167c428a9484a686e8616fab489c2a579f94bf20ba87c5aa8437a943e0096a9541b4a1510f0e09768de9cabf5
 EBUILD sqlmap-1.7.4.ebuild 1334 BLAKE2B 1fe71c950c682821addd140f103e63a519908b3f7edba932bb8191dff577e5c6d378cf17acddc8cbdd81aefff91102d916df6a7f76488164b17e9705ec64a721 SHA512 a6e6b2878f4b63bdb10c7e98937074cef23bedce9220a985ed4e021354ea213651334cc650640995c27edcdccbda184f0d5570edea3f6fe5945b63f0e94551da
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 1fe71c950c682821addd140f103e63a519908b3f7edba932bb8191dff577e5c6d378cf17acddc8cbdd81aefff91102d916df6a7f76488164b17e9705ec64a721 SHA512 a6e6b2878f4b63bdb10c7e98937074cef23bedce9220a985ed4e021354ea213651334cc650640995c27edcdccbda184f0d5570edea3f6fe5945b63f0e94551da
 MISC metadata.xml 847 BLAKE2B 31fdd4fd94a4b6ad8c775bbbc9cb48b5627f2f5944a7bdaf6c30f3559044dda6cd92be3b50c8baf462b1e2e4ea4aa905bbac88c616cbfbc833a4895a1944b0d6 SHA512 bddfbc5ce988bc1770a2ad1d6952d8ef44010c9e4ef789500f0408c7c5754960804f270bb6e24e4739852cdef07b3f22111ad9da453648730f045d0b2c3deea9
diff --git a/dev-db/sqlmap/sqlmap-1.7.3.ebuild b/dev-db/sqlmap/sqlmap-1.7.3.ebuild
index 550ec7d5d4b0..ad6dac4b9230 100644
--- a/dev-db/sqlmap/sqlmap-1.7.3.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.7.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index aee05e05a95b..9a8d2b35bd58 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 6089db082582..3664adada19b 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -4,9 +4,7 @@ AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b
 AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
-EBUILD libftdi-0.20-r1.ebuild 1872 BLAKE2B 4b881ee50115d6702542aacf5acc91dd144e5b9b5f30fb36a3c25efc3567d37209e7679313467c2fba62fa8feb082b60e27aced1881acdd109dac760b8f93ea8 SHA512 ddd327bc763da3dd9ab51e7f106858c5ba28eeaaddb36aecc0e71490ee5f1ff4d91c2e8baca8e6dd73e79b6b12829ba7dd40d15f8261e9aab0e46cb479f7466b
-EBUILD libftdi-0.20-r2.ebuild 1900 BLAKE2B 30ba6e86846edf900ef833c1184683043799c8fee58d078bddc19b2a095a93e79faf8d6cdc9dd6bed14495236c471e1cc2097776d728a380674be09b75c94d08 SHA512 f51216ee94e29ca3682acd885284cc3bc1a54725b9fc3539969dfce9b4830eed32d9c83f61aa9c0bfbb9025857cd0b0d72c30aee0e5d73ccd7b9313ab205ec9f
-EBUILD libftdi-1.5-r4.ebuild 1917 BLAKE2B 1964c36db9a1c0f1b24caaf393e6eedca049e98f27fe5234c1120d0d6ad882c49e6e1b32708b4e494f65768f773b5fb4c637af5c853e9c3bd73e7c6baaf8d697 SHA512 3d0321f0ecdcb5cec45e3d692398c9441336937e0cdb66f995694ba5125536da1309a9b06b844443df4cc61587b0ffa3002ca3d0a0d185bf63e43e327b35fed3
-EBUILD libftdi-1.5-r5.ebuild 1912 BLAKE2B 08190f83b1e5f1d677ddc321a701bc7f6e0a02e24c0fd651dcd1dc9ed11efbef04a80805f807896eef071a6a466f587332a519ef7e724b00073381390938d4f6 SHA512 4dea5b07b8b846a1bd0f7c71a548371de547ef97c84fa3b4a3856f14a3723c5b2803b3897ce2f03e89b7a551de483aeaf50f920cbe4a8902e1777615522f52e7
+EBUILD libftdi-0.20-r2.ebuild 1893 BLAKE2B a39b1ac14a76834a178f6ed4795b343aa7833a8f271a59456a974a78228730478200b04b16cfed26235dd53e7b711aaece240c22c085c7faa9a1358c21449c95 SHA512 d40117904508dbf21410a222e803dc96462622712c23ab95ae26808f46c8ac19fd908ea094fd8ebf4e07294b6f9c22ffae83bb0af847d477b33c2216ecabe494
+EBUILD libftdi-1.5-r5.ebuild 1905 BLAKE2B a908b98362ae9f8d0160f3b999cada0ba159c551f470726cb5fc4e47b379a91a574cf881e6844c1e7dcb1ee2d67460f408e8d5a4783b693b9f641b0eb0a0e83b SHA512 b61467d7e1cbb782c2b4af1b65e924d9839dd1778b5bec25ac2ac14d2cf082a9da88f13770ca53581eb3dbb7d28b11b0be29e4e9d99e74097b9fcafa7ce6f828
 EBUILD libftdi-9999.ebuild 1912 BLAKE2B 08190f83b1e5f1d677ddc321a701bc7f6e0a02e24c0fd651dcd1dc9ed11efbef04a80805f807896eef071a6a466f587332a519ef7e724b00073381390938d4f6 SHA512 4dea5b07b8b846a1bd0f7c71a548371de547ef97c84fa3b4a3856f14a3723c5b2803b3897ce2f03e89b7a551de483aeaf50f920cbe4a8902e1777615522f52e7
 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
deleted file mode 100644
index 726eafcea6cb..000000000000
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="cxx doc examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )"
-RDEPEND="virtual/libusb:0
-	cxx? ( dev-libs/boost )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-include.patch
-	"${FILESDIR}"/${P}-cmake-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use python; then
-		sed -i \
-			-e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
-			bindings/CMakeLists.txt || die
-	fi
-	sed -i \
-		-e '/SET(LIB_SUFFIX /d' \
-		CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFTDIPP=$(usex cxx)
-		-DDOCUMENTATION=$(usex doc)
-		-DEXAMPLES=$(usex examples)
-		-DPYTHON_BINDINGS=$(usex python)
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	dodoc ChangeLog README
-
-	if use doc ; then
-		# Clean up crap man pages. #356369
-		rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die
-
-		doman "${BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
-}
diff --git a/dev-embedded/libftdi/libftdi-0.20-r2.ebuild b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild
index 6b805b7fd6d9..3629e22a7d0d 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-embedded/libftdi/libftdi-1.5-r4.ebuild b/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
deleted file mode 100644
index ef8da75061c4..000000000000
--- a/dev-embedded/libftdi/libftdi-1.5-r4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit cmake python-single-r1
-
-MY_P="${PN}1-${PV}"
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python test tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )"
-RDEPEND="
-	virtual/libusb:1
-	cxx? ( dev-libs/boost )
-	python? ( ${PYTHON_DEPS} )
-	tools? (
-		!<dev-embedded/ftdi_eeprom-1.0
-		dev-libs/confuse:=
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/boost )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests-no-cxx.patch
-	"${FILESDIR}"/${P}-cmake-cxx.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFTDIPP=$(usex cxx)
-		-DDOCUMENTATION=$(usex doc)
-		-DEXAMPLES=$(usex examples)
-		-DPYTHON_BINDINGS=$(usex python)
-		-DBUILD_TESTS=$(usex test)
-		-DFTDI_EEPROM=$(usex tools)
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-		-DSTATICLIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}/test" || die
-	LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
-}
-
-src_install() {
-	cmake_src_install
-
-	use python && python_optimize
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use doc ; then
-		# Clean up crap man pages. #356369
-		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
-
-		doman "${BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${BUILD_DIR}"/doc/html
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-1.5-r5.ebuild b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild
index 263ee7edc9ea..5dcfc99db973 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r5.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r5.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 	PATCHES=(
 		"${FILESDIR}"/${P}-tests-no-cxx.patch
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b121785e7826..6f8460ec535e 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 93cae60c6bce..f99584f68989 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,7 +1,3 @@
-AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
-AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
-DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
-EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
-EBUILD commons-logging-1.3.0_pre20230319.ebuild 4233 BLAKE2B 13ff753003fac3d88cab8e760cb946efa3249d37dc06eaaa05e1f9d14f62014ab6a4e93965e5701e54519a28e690784c3762152f5a0281493781ad13f5aeaac0 SHA512 52a59dff35802c58872d3a79804cc47701e1f152b0de5d356b2aec2f015a235edcebbcb6046ae183af71d242091efe6ae46cbf1346cdbaa49534aa820e307822
-MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849
+EBUILD commons-logging-1.3.0_pre20230319.ebuild 4229 BLAKE2B 9611fd81e67a1a21c6a6f87638c8a5b1413688406dd8336c8580aa02daf59f4be3d5372bc80144771d2d6c066c8b43a0f0cd33eff8bff00ee92dc9f8ecad783b SHA512 da522092c9a1dacdedcdbf3c979e8d24e15323d61e94010a0b053135b300234640fcc79690939b592cfbb9c818af1c37eb9a95af9776b546d65faa026c8dc416
+MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0
diff --git a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
deleted file mode 100644
index 8c38a37bc9cb..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? (
-		dev-java/log4j-12-api:2
-		dev-java/log4j-api:2
-		dev-java/log4j-core:2
-	)
-	servletapi? ( dev-java/jakarta-servlet-api:4 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	eapply "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties || die
-
-	if use avalon-framework; then
-		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-	fi
-	if use avalon-logkit; then
-		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-	fi
-	if use log4j; then
-		# log4j12.jar can only contain path to one single file because
-		# build.xml decides whether the Log4JLogger should be built with
-		# <available file="${log4j12.jar}" property="log4j12.present"/>,
-		# and a value that contains multiple file paths will cause the
-		# test to return a negative result.  However, classes from multiple
-		# Log4j 2 JARs are needed to compile the sources.  So, we combine
-		# them into a single JAR on the go.
-		# https://bugs.gentoo.org/834036
-		mkdir -p "${T}/log4j-2" ||
-			die "Failed to create temporary directory for Log4j 2 classes"
-		pushd "${T}/log4j-2" > /dev/null ||
-			die "Failed to enter temporary directory for Log4j 2 classes"
-
-		local jar="$(java-config -j)"
-		local dep
-		for dep in log4j-{12-api,api,core}; do
-			# Assuming SLOT="2" for Log4j 2 dependencies
-			"${jar}" -xf "$(java-pkg_getjar "${dep}-2" "${dep}.jar")" ||
-				die "Failed to extract files from ${dep}-2 installed on system"
-		done
-		"${jar}" -cf log4j-2.jar . || die "Failed to create JAR for Log4j"
-
-		popd > /dev/null ||
-			die "Failed to leave temporary directory for Log4j 2 classes"
-
-		echo "log4j12.jar=${T}/log4j-2/log4j-2.jar" >> build.properties || die
-	fi
-
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjars jakarta-servlet-api-4 )" >> build.properties || die
-	fi
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	# Do not run Log4j tests because these tests use an Appender to verify
-	# logging correctness.  The log4j-12-api bridge no longer supports using an
-	# Appender for verifications since the methods for adding an Appender in
-	# the bridge "are largely no-ops".  This means an Appender's state would
-	# never be changed by log4j-12-api after new messages are logged.  The test
-	# cases, however, expect changes to the Appender's state in such an event,
-	# so they would fail with log4j-12-api.
-	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
-	sed -i -e "/^log4j12\.jar=/d" build.properties ||
-		die "Failed to skip Log4j tests by modifying build.properties"
-	java-pkg-2_src_test
-}
diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index b478d6426af2..fae791f5d474 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
deleted file mode 100644
index a654ce1fc763..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -773,4 +773,23 @@
-     </fail>
-   </target>
- 
-+  <target depends="" name="javadoc" description="o Generate javadoc" >
-+    <mkdir dir="${build.home}/docs" >
-+    </mkdir>
-+    <tstamp >
-+      <format pattern="2001-yyyy" property="year" >
-+      </format>
-+    </tstamp>
-+    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved." >
-+    </property>
-+    <property name="title" value="Logging 1.1 API" >
-+    </property>
-+    <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
-+      <classpath >
-+        <path refid="javadoc.classpath" >
-+        </path>
-+      </classpath>
-+    </javadoc>
-+  </target>
-+
- </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
deleted file mode 100644
index a9fccba8d5c1..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -279,6 +279,8 @@
-                classpathref="compile.classpath"
-                classname="org.apache.log.Logger"/>
- 
-+    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
-+
-     <available property="avalon-framework.present"
-                classpathref="compile.classpath"
-                classname="org.apache.avalon.framework.logger.Logger"/>
-@@ -315,6 +317,13 @@
-     </echo>
-   </target>
-   
-+  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
-+    <echo >
-+    *** WARNING ***
-+    ServletAPI not found: Cannot Build ServletContextCleaner
-+	</echo>
-+  </target>
-+  
-   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
-     <echo>
-     *** WARNING ***
-@@ -337,7 +346,7 @@
-   </target>
-     
-   <target name='warning' 
--    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
-+    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   <target name="compile-only" 
-     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
-@@ -365,6 +374,7 @@
-     
-       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
- 
-+	  <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
-       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
-                unless="jdk.1.4.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index 6d5d06dd2376..6f7f23a3f9e5 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -11,12 +11,6 @@
 		<remote-id type="github">apache/commons-logging</remote-id>
 	</upstream>
 	<use>
-		<flag name="avalon-framework">Add optional support for avalon-framework</flag>
-		<flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
 		<flag name="log4j">Add optional support for log4j</flag>
-		<flag name="servletapi">Add optional support for servletapi</flag>
 	</use>
-	<longdescription>
-		Apache Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/istack-commons-runtime/Manifest b/dev-java/istack-commons-runtime/Manifest
index a9a2719a3431..8969540425a6 100644
--- a/dev-java/istack-commons-runtime/Manifest
+++ b/dev-java/istack-commons-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST jaxb-istack-commons-3.0.12.tar.gz 66063 BLAKE2B 7f869d17e78b62eac08b1c7c6bb0b974d9c7a8e4f0ad79ed4d659e3ea672a1e4947cd90fa122ac3d9b3ce902e17e8bfc7eca3d9133332bdbe1ff236d47b3bac5 SHA512 41193fbc20e9332f66754fc4dd52b7e98bd905c4a5dbca8adc46cb9b29f3e5fe39a684d9ca08b38c5ba15e54acb69dc289b72e2885946349bb48f4e9c2e34dfb
 DIST jaxb-istack-commons-istack-commons-runtime-4.1.1.tar.gz 66161 BLAKE2B 07103ec616d23e14a5f61c4bb7ef9dce042f0df678db44f035b48c74eb7930f251d8b7fd8ce36c9bae7a7ef8ce213c62587dad2547518ba4638faf102ef651cd SHA512 b119b2c3582f5cbbd5793e0eb0a00c199c93119f3c18e34c57f8753b3a7008b9b93de58fd62df94d6cbedd698488616a80c334fda3d5038078e3858229f995cf
-EBUILD istack-commons-runtime-3.0.12.ebuild 993 BLAKE2B eef7078dbc61e67370b20125dd0471d54ccbb37d33158be33e0a61dba69c221dbaa86b7f7ddecae7b8e3aad3170fcafbf7e28749a25fdeeae113b57f302f8ffb SHA512 75b6a6d29c396be07231608d45647b099f5b1f6fdbe17550141b0c5fa98f9a2f104c10886dd342afb9637bda672c67a6d3a1e8a800d2bf03ec8b87a408a3b34d
+EBUILD istack-commons-runtime-3.0.12.ebuild 990 BLAKE2B 68ddd362039cc97f95f2b37006d1e95d32172669a2b4321adfecd8484b15e75cfe2a5da32a6be06df67db5165e4dc0fe49522e9566d4f33a1b3f651787aa7c7c SHA512 f32b77761a845e843f871424507f0d7a268b1a472a50310f58e6fe8b883f5aa954c977f462ec412eb760f8ef69655ec7a650186a68b5785e04733302f13469dd
 EBUILD istack-commons-runtime-4.1.1-r1.ebuild 1568 BLAKE2B 728468bac6561a17fc4261db19d3aa59b28c46a919a574f354a086c0f18b1653cbd44560400b5f4d4b0a4be35e387678c3564c30d416a108965c4bba2ae2cd6c SHA512 1829283da6bf6e67832f18b18e403ba2007529945f1abf5b3c7ac578f8fe5e572570ce664a7ea3f62a95afc7d566ff42afa81b5b83756f0ed075ebaebe5dd687
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
index 7928ec12553f..571a37d385e3 100644
--- a/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
+++ b/dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-istack-commons-${PV}/istack-commons"
 
 LICENSE="EPL-1.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 # fails if jdk-1.8:* # https://bugs.gentoo.org/857024
 DEPEND="
diff --git a/dev-java/jaxb-runtime/Manifest b/dev-java/jaxb-runtime/Manifest
index d8c00711e874..78987788635c 100644
--- a/dev-java/jaxb-runtime/Manifest
+++ b/dev-java/jaxb-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST jaxb-ri-2.3.8.tar.gz 1734411 BLAKE2B e60a7f78f2bfaf23cc0ce6727ee1b1611facdeebd5b456c207260447a508674dcbf934d2c6343cfbb58b93adf3352c8145caa2a8c77e264ae2403351527ff96d SHA512 73fda68e8d936b681d53ec72153cec0f7608517d0f037b4f140e4fd48e26f3e03a88f5b34bb635d0e6c7701121befd7d18a98aebd019a663e08ed9667a39c535
 DIST jaxb-ri-4.0.0.tar.gz 1739184 BLAKE2B a85a12fdca0b6eff8664894d65e2f82d30491e20050fde2ca828fa3c2c79ce2e158fca5ce6d0ae2cb2a00859abc0c9e9d49321c0943b862fd603a9e732f29dc4 SHA512 766a58d5107a88c19a99014b737b7b14a510b928dd26991adfe902073614923690c1e5a231834ec4a200a10adf9505b27179b8d84cf09dbb09292341c328e743
-EBUILD jaxb-runtime-2.3.8.ebuild 1693 BLAKE2B 4fc0a897e88c4867e2dce10963d69ce40b19538afca615cda243a334137966455c41bea2adae1eb6e3c530065fb3801a67a6b6d20e58ab2887b8397979e2e8b6 SHA512 9c8c2433fdbc9ee7b87e03b9acd6d9e14c197b4f826626c7735bcf9ca8e31053964b64ebee38f161ac76d3121e3034185d09fd50df344960753aab2e7791593b
+EBUILD jaxb-runtime-2.3.8.ebuild 1690 BLAKE2B 5da02d171f90b4ccf35fc10c6663aeff064985a67e8e753a5789eb23c888b11da8948ff6011750fcfc1e63cd24a03f6b2b5dc294ae08784bd4bb827c796cb42e SHA512 cf32840ea788543f997bfd54f721c0053fe822453e31f361cc4def13cb7b71e4ba8f5fdb4b73e09b319783058de2e09c3a2ddb84b1182a3a5e139720765a6a49
 EBUILD jaxb-runtime-4.0.0-r1.ebuild 2985 BLAKE2B af8937c9a12b2e8f7f95f3b6977e7f70bfc9177c161ccf2effe99fcf7ef8ce2614759d66b8b47a951b720612f87b5de83bbdcc719d67e69f829d62c662c92156 SHA512 0e87d19a371a6a012b7d7e004ce38f34a71b0b2896eecdd55e4dbaa19200e0daad52425c0a05bde26fa3bae414acdff94c223f42464b55dd67fa028518c93b78
 MISC metadata.xml 302 BLAKE2B c04f1b6c40f598e273d357faeeb149504ff1bbd5fcdb170549ae43314628eb5793da9ccf8c76956ce7a2b565db95090bdccd09fba5bac36fc26a7eb48bb63ef4 SHA512 5c11021d5ec5661435d8d6fca6ca9c0cdb34c859ddfa2a4752bd5de06575a36828f5ec9ad9c21b9c90ab92e693b0ef40b3e14bfa0cf46d9892481b896e19484e
diff --git a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
index 8d0c6fd7097e..b9c2c5895d8b 100644
--- a/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
+++ b/dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/runtime/impl"
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/fastinfoset:0
diff --git a/dev-java/jaxb-stax-ex/Manifest b/dev-java/jaxb-stax-ex/Manifest
index e9c9b856658c..6d927c60882f 100644
--- a/dev-java/jaxb-stax-ex/Manifest
+++ b/dev-java/jaxb-stax-ex/Manifest
@@ -1,5 +1,5 @@
 DIST jaxb-stax-ex-1.8.3.tar.gz 28164 BLAKE2B 992597cf7556221449755f8d20b7695c277e6e28289cc4a60203d9ad5c9b549559ee98092cc03a11220221843eb02e7969ae307fb85924718aecc5a8c4dc9184 SHA512 c7a360c44a0546a2d8b5dac652886d439530049286791e61a4296575dde6b91f2d11e2b2b6d85b72494f8976d1ff15858f1032c880f2e61d24afca24e7f01cd5
 DIST jaxb-stax-ex-2.1.0.tar.gz 28683 BLAKE2B 774f7420f996eb52abc9db56753f0fc492164ed12f4ddffacad8f801ac759666e6dcae85cf24ce1231df4d49d5b5084278d2cac0c5c129302ec973c215408782 SHA512 f81dcb4870800c4799e716254b84e57a15ef36a9e6a8502da7ee2711aad67765595674fccc1c4d9d4e8865c642dfadd694f8849d4e98c4e9f2368cb940deb38d
-EBUILD jaxb-stax-ex-1.8.3.ebuild 861 BLAKE2B ac98e1a351ab41675afc125a06db34e67c89a0d742c154bc4bfeff27385a8ac73922cdb87d055f0993216fea32a2aef32592be51a7974616ae02de1f95ad02dd SHA512 d27b69b036844df47c32db7a2a745c98714f351f571c318ce23c65c7640dbb90a74f5bbca4d3994fe74c52713b7ac07ad71f501f1cdac68da326d6936fd66080
+EBUILD jaxb-stax-ex-1.8.3.ebuild 858 BLAKE2B 95f1931ddf54bc4679f288b463ed672990c54a99d21ff10b9e077b9dccc8e1aa4b0994ad601f403c82b50c2096f7d61456300728d3b6b16a6b7015e5decf9c88 SHA512 25fa33abe83f7372211606cd185fe69d8bcad08fd65ccb808954aca76dafa95e585c3367aa0d9f97903f7f7aa27e768cf5fd84b8ad054346bb2031dc93a43798
 EBUILD jaxb-stax-ex-2.1.0-r1.ebuild 1055 BLAKE2B b3f7c3622b7668ca78c19eb8bc5dc1813917a619946da7cdacb47e5d7f12dfe9ac0ea4a7b7878bee3a651715d9da29df308294713e6a2c32f58214e7bfdca38a SHA512 e89fe08171d0efe22c26c1e229f1fb44d9695ee516baddddf84a958aa98a4cafeaea66fde1f28335c694bd5f8930596da93f11300ac8643e35f1cbe32b6344cf
 MISC metadata.xml 307 BLAKE2B 840958b9dae03e35215d38f5415e7ebb855549276943e3a968ee0fb032a7a46384507232c3510ca72851bf3e4e78a482ccd4b9f7f3b712a7688254d113b1c120 SHA512 6cf44eed10944c273565dd6ba3819edf2850976a884f0ac1a4f760363eeee8ccd2f49312f7412eeaceecfe8f80adda0bd67f45366ed0bcd1aa7b5504a6361401
diff --git a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
index f05f61ca5422..9c70db275bfe 100644
--- a/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
+++ b/dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="EPL-1.0"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND="
 	dev-java/jakarta-activation-api:1
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 3efc09e01e76..fc2fb3cee211 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,9 +1,5 @@
-DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B 0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6 SHA512 21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
-DIST apache-maven-3.9.0-bin.tar.gz 9024147 BLAKE2B ba2545a44a20c7ed7791ea116fbb72d549409d955f8403355e13cf86b95ffda685d5ee0c3d3377f2b5481b25a2f0e6f45d51e89b1ba5913c9be0688a98f8d585 SHA512 1ea149f4e48bc7b34d554aef86f948eca7df4e7874e30caf449f3708e4f8487c71a5e5c072a05f17c60406176ebeeaf56b5f895090c7346f8238e2da06cf6ecd
 DIST apache-maven-3.9.1-bin.tar.gz 9039409 BLAKE2B e1925202d8b5363f16cd734aca409091a1e7f56fa9220aa6060a79fae6dfd37772daf04bc15edc2918757ac718ea41e861583c86dff40b0e3172fa0a7cdfbcef SHA512 d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3
-EBUILD maven-bin-3.8.7.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
-EBUILD maven-bin-3.8.8.ebuild 1374 BLAKE2B 0e4ffe7791605de36fcec218f368d0a9323cd1ae9b98b122b6431cf4bc38ab8e47d5a4d4fac4ee232472d3a78d3dd1855894520ca96219768e9a759e444a632f SHA512 5697cf091533bb21beedd022bbe778f285398577c5cc85793bf2931dc91aae77486ce354049f6e4dc1b6bfd1e87694eb465bb750240ca08fbd174d7d6f7e583c
-EBUILD maven-bin-3.9.0.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
+EBUILD maven-bin-3.8.8.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
 EBUILD maven-bin-3.9.1.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.7.ebuild b/dev-java/maven-bin/maven-bin-3.8.7.ebuild
deleted file mode 100644
index 110c8ce5aeb0..000000000000
--- a/dev-java/maven-bin/maven-bin-3.8.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.8"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.8.8.ebuild b/dev-java/maven-bin/maven-bin-3.8.8.ebuild
index 9248c8bb462c..110c8ce5aeb0 100644
--- a/dev-java/maven-bin/maven-bin-3.8.8.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/maven-bin/maven-bin-3.9.0.ebuild b/dev-java/maven-bin/maven-bin-3.9.0.ebuild
deleted file mode 100644
index 59bdf23384c1..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 38f1b9fc7335..3bb52a992d64 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,5 +1,5 @@
 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
 DIST snakeyaml-2.0.tar.gz 405458 BLAKE2B 69d81e0b23080ff86c1f6fe8a924a504d627c353bf9c026703ef54f14e572458e77c501415260667bcb18008ee96ca99cab7ed43c004d36fed781500f09054cf SHA512 ef4da2ae5f5e6cd7b68aabb0d37a4fdbd33be899cd1d4dad3210cc791ca85af57661f623898449841b930eaffc9e61cef337efa4e6371710307ef3758f0af329
 EBUILD snakeyaml-1.33.ebuild 2339 BLAKE2B 798becfef801473ced001ec15e00a5ddc799369e5a97eff1140236716fe463d592b68eb0ea9f0b5395b1956575ee0b6e070f631fbe135d546f988d945b574f85 SHA512 a9192e54c120b9469ec55d52fd2cfc7ca84e553da4b93ef6c0b2e4495bf5bbd49a65130fcda7a4f38a5d6cf4deda7d190bc50d65259d183af5d3b93deb8f5c9f
-EBUILD snakeyaml-2.0.ebuild 2319 BLAKE2B 7ca6114ab35e0430ea71b39fa6bc7fb924c7345ec1fca00491d2546ac42ce53bb7d2c4640d086023297e4b6ed3963dda90a9afa441445375a704c914b97edddf SHA512 99f72310b5c37023027086e045d03fb8064adf38db4b0e110cf42c0448e5ce9bca652aff9202b66c79bc0c65035c1f3b81db52fd04b8f98e3a44b724e1a5248b
+EBUILD snakeyaml-2.0.ebuild 2316 BLAKE2B fdb2c964c1d3e12caff12f134458d132ccba92aedcfc8e6594e5e1eda2d80e0e8ec6340d94633f121f49fc470a86a8cd71dc73c08b4ece735b302bbd32bfb6ce SHA512 6be8f1937cfaf838e20ba230464bd04a5247cef153f0c1fa8312294ea2e5404a536f42ae8abacfe020467481e91e3c6ca219623a7664b5632df9fbd2b109780d
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/snakeyaml-2.0.ebuild b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
index 9066dbd63aba..6bc7f5c89542 100644
--- a/dev-java/snakeyaml/snakeyaml-2.0.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/snakeyaml-snakeyaml-59ddbb3304bb"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml
diff --git a/dev-java/txw2/Manifest b/dev-java/txw2/Manifest
index 6977cadfc232..a34d4d20a537 100644
--- a/dev-java/txw2/Manifest
+++ b/dev-java/txw2/Manifest
@@ -1,3 +1,3 @@
 DIST jaxb-ri-2.3.8.tar.gz 1734411 BLAKE2B e60a7f78f2bfaf23cc0ce6727ee1b1611facdeebd5b456c207260447a508674dcbf934d2c6343cfbb58b93adf3352c8145caa2a8c77e264ae2403351527ff96d SHA512 73fda68e8d936b681d53ec72153cec0f7608517d0f037b4f140e4fd48e26f3e03a88f5b34bb635d0e6c7701121befd7d18a98aebd019a663e08ed9667a39c535
-EBUILD txw2-2.3.8-r1.ebuild 648 BLAKE2B 1fdedbf9adecd4fb9b9b1eb274c4e02c8edbc9df96e78f2ccadda1fa4c2166260d44a7e6818ce85f4cf0383170a4d3b96c85530a818e2fb152c867552a18697b SHA512 dfc5cc03b79f48ab602c02d642d6e9794e4db9c1862d705ebf2e89cac87a798685bc9adc32b50b3519ad55d7663ea4690f2e834aacc0b300c342d7415909c551
+EBUILD txw2-2.3.8-r1.ebuild 645 BLAKE2B f74f63f9928185f3454ef85421119942f57a107826b26120074e9d3da3d753a9cbdfff6cd0daa74b3ea0a41fe0ddab706fec9b3d5ae680926cc4e1e2b0a5ce92 SHA512 9df0ca243d8bfa32b4517a74bf64e778c8a9f6f7e98f5a87f929ec9bd7a2186af468eb006d47f56b8b28d548f3021077e17b4748080002db880b38f2cb0d63e8
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/txw2/txw2-2.3.8-r1.ebuild b/dev-java/txw2/txw2-2.3.8-r1.ebuild
index 10dd1ba38bba..dfc1df0ee1a9 100644
--- a/dev-java/txw2/txw2-2.3.8-r1.ebuild
+++ b/dev-java/txw2/txw2-2.3.8-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/jaxb-ri-${PV}-RI/jaxb-ri/txw/runtime"
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index fae11718e083..e6b712d5f04a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 96b3b36ea47d..54532a5f142f 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -4,6 +4,8 @@ AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee0
 AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
 DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
 DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
+DIST jsonnet-0.20.0.tar.gz 22481277 BLAKE2B 65d6a45a903d6f494bbb79fb92c484b2a5167fc5fc379f4acb131778e1779aa580fd249baf3309fd00fa9b2a3b129360bf9d2cb0a3a738bd03c5fcec7dc6bd32 SHA512 d46d2521d4389d05f91a16ecd9f181be1853f674a9264e9fac23e413f1084dee947e80682af59603e15e443061a0beb50a30c14c858853e10ed1ae7187d09730
 EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B df21dbc4afbca5992a0a8841c155aa63ddb83eeb716c7257c185097688fa87a8a2fb706299bcc19e0235acd650249034a7e2e39b1d8ebec7987d97dee10e4ebf SHA512 b9c20cd3cb195500537c9df8c47c59c1de77e2fcad365447297651de0c787085b5d2abb132aac2407ecf8f82b63e4a7e58f3de275aaf929ff5b9fecf4bf4f678
 EBUILD jsonnet-0.19.1.ebuild 2139 BLAKE2B e7190af8fbe34753a46876881b1bac40d2f1b5f221cfd039abe3438b23cad4649b8ad91581f14626b36d7b108675654e6ecdf20cb327038bcd6d8da8fbee114d SHA512 d5da70267a27785c57b7be29ff92c87d7469029e7125d08ca9eb379a8891e3886b404789b1ddfe656a5753da620b1a0122041ab047bf90511364727cf8484ffa
+EBUILD jsonnet-0.20.0.ebuild 2139 BLAKE2B e7190af8fbe34753a46876881b1bac40d2f1b5f221cfd039abe3438b23cad4649b8ad91581f14626b36d7b108675654e6ecdf20cb327038bcd6d8da8fbee114d SHA512 d5da70267a27785c57b7be29ff92c87d7469029e7125d08ca9eb379a8891e3886b404789b1ddfe656a5753da620b1a0122041ab047bf90511364727cf8484ffa
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/jsonnet-0.20.0.ebuild b/dev-lang/jsonnet/jsonnet-0.20.0.ebuild
new file mode 100644
index 000000000000..8e5c294e6207
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.20.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit cmake toolchain-funcs flag-o-matic distutils-r1
+
+DESCRIPTION="A data templating language for app and tool developers"
+HOMEPAGE="https://jsonnet.org/"
+SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="custom-optimization doc examples python test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+RDEPEND="
+	dev-cpp/rapidyaml:=
+	dev-cpp/nlohmann_json:=
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
+	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
+	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		-DUSE_SYSTEM_JSON=ON
+		-DBUILD_STATIC_LIBS=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTS=ON
+			-DUSE_SYSTEM_GTEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
+}
+
+src_test() {
+	cmake_src_test
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
+}
+
+python_test() {
+	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	cmake_src_install
+	use python && distutils-r1_src_install
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		docinto html
+		dodoc -r doc/.
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 0b4da17af646..47894244258b 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,7 +1,9 @@
 DIST vala-0.56.4.tar.xz 3978480 BLAKE2B 22cde236f3d397499f6bf41c038422bf17bb5878096eb27c4a1efec9ea296623e52099250852b0085ca691243ec3cda6316598b20e3700816e2bf29032e625a4 SHA512 302e72a42fcb0cffc1c8eec28014f216c3848aaecec100acabc5e952d6f3ad2471b341e92a266f452c3335b8d1dde9cb0b1e6da62b754ffb4749b0aa862f24ba
 DIST vala-0.56.5.tar.xz 3987316 BLAKE2B 3f8678f894f526da310dd65b2a0e9ebc9e7aff6cc89538dbbbc4d2798ead7bdaa27ccb33834645494fad869e17e2f32174626ca6d190c661a2df2a498bfafdae SHA512 58bb5ea45f519414ffe0dad2f23dcf689eac2d8cd310a627d0c3667f38ec4ccd5ec1ca5921f8ec177db3004f24c7c5a138bd4652c7a07a78f0ce046e32ad9b6a
 DIST vala-0.56.6.tar.xz 3989404 BLAKE2B eae35fb685f546cee902a84a9a0ea15fa1c3596a94c1def93746512e32e22b65ad80f788a7899c5f69f5447906880318ba2b78dc582a9fdb7cf70cde88404aa3 SHA512 ea9c25b96f52ed1067c2a8787b15c44a088e19907880ee6b32bb0e3b544a078bd342e3aef9afefb8daec6f6b4fce25a9290a278dcfc293308327153543acb9bc
+DIST vala-0.56.7.tar.xz 3992100 BLAKE2B 09804dba1dcaaef2af2621f7ee6c5c69d0bb06c1f83162df4379f438c9a8eab94e9496b1be1dc9ca25e796caadf38342921884e3460c00d3693617b94a61b013 SHA512 f524ac7acee988aae895a9c850904b5a6b5462ad3b498fa4305cea9b97e3e966b0ace341ce0ba9ba2466e6d22a1fcd4c657600c5d838d80cc0ac75be8e6d3185
 EBUILD vala-0.56.4.ebuild 999 BLAKE2B 4a53efef87d29147dda03ac4f8e0fe1daefdf1c716b6c2112070f9b617ba6b85341678cc1258583a34bab49bed3773812c6ad835686bab7ca8385e11a6bd090b SHA512 cec6905a1b4967d3c7a3dd1c784b89393fa32e8473b0c123ab69a189882563c4489c6495db9fdeffdac09ab238dd6b57c90e2029f23ac3d87c6abeddd92ca807
 EBUILD vala-0.56.5.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
 EBUILD vala-0.56.6.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
+EBUILD vala-0.56.7.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
 MISC metadata.xml 441 BLAKE2B a67ac153219c809b992ad569958248e09fe402e33526f2c9a8e5ef4908a5496a0018894605f2d649e191bb84db59294526bb14a06e59f4cfca335dcbf18e15f8 SHA512 97774503c4e5cbce834f11865cea98e45b244566373d8a7efca73d18346d425b49a3b96cda02a61484a8c906d9f27d735c2a9899701b95d0a5f62b9df12365f9
diff --git a/dev-lang/vala/vala-0.56.7.ebuild b/dev-lang/vala/vala-0.56.7.ebuild
new file mode 100644
index 000000000000..70072f140f0d
--- /dev/null
+++ b/dev-lang/vala/vala-0.56.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.56"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection
+	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b4d8c92e1fbe..79038e9471c0 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 197126fc6fc5..adfffbbfe051 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,6 +1,6 @@
 AUX confuse-3.3-fix-CVE-2022-40320.patch 1137 BLAKE2B 6fb44768b35dee93ecf03859cc0c925072ef7e8506e91869d9436b7627d9c8d5c9e4608e47479e6ba67ccf98db9b29c1563511b2186ed6ac89563a03c9a75f0c SHA512 0fc8484484ea04906f9196df59bafc9739ed99b785fb001847b9d2d13a6055029debc793b28a0fea67be10534d1dc0d1c3c6bc8c7d28bf0eada8a0aa2bc15226
 DIST confuse-3.3.tar.xz 485140 BLAKE2B 41f426544341966e4a4148c40951dd7f6771b70b182e9ab9f19ce9be781c3ca42c86615f48e91f3997c8e0654111de2360a09c070afc21047b6edb4a8187755f SHA512 93cc62d98166199315f65a2f6f540a9c0d33592b69a2c6a57fd17f132aecc6ece39b9813b96c9a49ae2b66a99b7eba1188a9ce9e360e1c5fb4b973619e7088a0
 EBUILD confuse-3.3-r1.ebuild 1247 BLAKE2B a30d67299d61093a3863dc48e414b2e833bef615674191939d111633bae67c348b101fb5eac00fa48f25d94c34567acfdf60bbc520a8e3b3f63e3c8610ba8f33 SHA512 15f301f21c9e40285cd7a3252c1d761e1fb637f428210139456722ef37d44674da9d2f794ee95552196829dcfcbb4c23be4a59761f5fedeaf26ee28cc8b2c260
-EBUILD confuse-3.3-r2.ebuild 1453 BLAKE2B d623811b160e20e650a679b0b57c2c20dcb68164b0a9ad430a0ccdba586a41c0638b1b8ee4793e82fc920392f7bf1a7e90297edca2df1dae7730c3b1eb9abe53 SHA512 a6c40e6bd845dcf66b2f212b0dd96fff019c379214227dc2eb733b80a5665df082f30cfa810284e128989ffffffec923a5edf5a1378038e64d88801850519c48
+EBUILD confuse-3.3-r2.ebuild 1446 BLAKE2B 4435be0fdc5401e8d0fcff7d2cbd7a95131a9f86b6d132e76cb64f6b5f9f9feab6f1b5eecf1fd5c99bf0d654a9cf16715801444f4278e1d767c388de844b5880 SHA512 ac7e5cb80abe6caa3ad848905f2112ca395cbed7a9a19d5015e573f4a8b3a572500a299d3fdd041a563bd6998c37dd0f1b9d10b7d08780900f4d2ba2fde6f97b
 EBUILD confuse-3.3.ebuild 1162 BLAKE2B 867decdf55291a7acf6bf2cc5b557adcd5b2d18e50b116193aaa93532820e07212bf694dbcc4c42d42edbe00cc718b6f50cbd46f0153a4614c44b08828e6aa6c SHA512 6824fbbd39fef2b209d76e92dc4ab35947e4af35d82bef885e8717a4724d36ba634a7c3e7819aa78292f098f0c536a85773c2a4dd5bfc37b5c3fe78d65d1a8ca
 MISC metadata.xml 324 BLAKE2B 4b07d6e5ec2bd4a458f3441b4da7653d4d92b2a3d9ddf451976baac0e0631de0d66fd2fd3812447bf18c91c752e0ae84cd82a476a54af2c57999b92934d52fba SHA512 bd23cabb445578fab14d5eed7d112cf8f75c6be6b3879b56edbeeef69070beef42a6a2f6cf40f0406fdeaf38e46dcd3a4f27ef4bc14e09fc1c95c48492724854
diff --git a/dev-libs/confuse/confuse-3.3-r2.ebuild b/dev-libs/confuse/confuse-3.3-r2.ebuild
index 57c0210569c8..2b8a99699efb 100644
--- a/dev-libs/confuse/confuse-3.3-r2.ebuild
+++ b/dev-libs/confuse/confuse-3.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="nls static-libs"
 
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 8a404a5e2705..aa504f2e320e 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,8 +1,9 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-23.05.25593.11.tar.gz 6181361 BLAKE2B 4cab9f759bbcb10dd91776648d1e300f752f49f0ffcacfacf2519648b7c02b3dde1f04c4c6104896baf24cafcc9382406cd931e224f5a656718ec10629c74f80 SHA512 5bfef689dbb7c7ed2b500c4b040eed4ac43c5a5f418fb94125db51193d4269379fb1b2cd8c95e53a2e4024c3415455f2dd7a07e79b4bf84c27b29150c328627a
+AUX intel-compute-runtime-23.05.25593.18-gcc13.patch 7264 BLAKE2B 2c802323331bb1859403e6f3d0c27721d2a7480048cd26c9b0e36550b49c9cbadd8d22b01c75c77fb2f0881b6d99baca9f0a69bc96a277a20cabacd9b45ae41f SHA512 c4787222c99df0c3dce49e448cb456e0ca0f6e8fccdf755862576c908a71f2a03f2886b36f45a9fd91b0ad67f49ee63d3037ec998372ac1ba02e76b1f014e9d2
 DIST intel-compute-runtime-23.05.25593.18.tar.gz 6182150 BLAKE2B 81dcceb6d13e3dfbf5fb811faf406617dba7f83d908b94806b76df115b70a3906d8786ea8aaa1b92e963a0c97e843d13e10d7c4fd66885d309ce910c7ed18d56 SHA512 f249e51f78faee84e3bd253f1ea39fe06337939f54612f0f645e0e57319abe8449e1822291dbf1760e3805a60bdaad36c59df523859a5d879d39024138bc0907
 DIST intel-compute-runtime-23.09.25812.14.tar.gz 6264026 BLAKE2B a346ee4b12a774532bb1e716159e8256001ef933b7e5943752d3eccc046a3a95b84b1b6679d81771653cab7182f51bf64cb9443da8a0cb38fea2cfd3d7ab620a SHA512 4e42b1ae8ee2f7b21e35d37d15339d18dc871f27ca759c97104f7987688193a62eabd07107cf337679a28341eb71119c5e3edc40ec48a1997a2ddbd213ba02ea
-EBUILD intel-compute-runtime-23.05.25593.11.ebuild 1972 BLAKE2B 1a4fe6370157d251c9cd1c672327a2c7e113eed93d340c048e1c36a8308eba0fdc4d5f0d95e447f6af029dbc6a991fcd43bf8e3e51a4e8d0ff7e79b9d3f0fca9 SHA512 b3c982e873bbf738f949907cf8a909d3d9bcc5c84e02a8698d1de48b23e8fa01f42c1687bcd01c01761b2ed84340bdfb6c236be2a5a969010b009bd4c62ad84c
-EBUILD intel-compute-runtime-23.05.25593.18.ebuild 1973 BLAKE2B e0af9386da9bfb53ea66d3316f3efc3a8eab9b9f723ce072048631597fa880a97da93e1bc5df3f3a4a5e5677e1b771f6a29602d74ec5fa3d7c9372bf58b9d4fd SHA512 f423e4bdeee5272cd123448901ee62ac40bbb19a97783a50a4288ba25c838908002dd3df4fd42a5e7202608f5e346a4dbb602ae013b59342c543cd26bc507c90
+DIST intel-compute-runtime-23.13.26032.8.tar.gz 6441876 BLAKE2B e795542080edb21feab1272c4227e88096741051a879301548ed9c3d74fa8453a8738763e07a77b21b1f0ab1ed9f549235c1a5c398f8733c53f34545233128de SHA512 c3e0644c3e90c0bc4c023a0213ac8d25dcacc08dde7f6e3ec677c80e1c5b9d017f495a2192b9c89f5fbadb5de538cb8e460f66956b59e60351ca2162b69357d3
+EBUILD intel-compute-runtime-23.05.25593.18.ebuild 2020 BLAKE2B 319e06b4dafc68855c2bd1fcf72842d95af685bd3e55ea0877ae058c78293b5ce1590cfb6f5dc0663df3bc0e6a290ae2e6a07e758e387944426ad43f6c5ca447 SHA512 e8ffe745f7ae10e95d3f04b5f74816baf2f2a2e3338eeff0ea913355a30ceef4823d514813a7100f5db41f301ce583c0b5ea68a71aa7dae081690c77586a645a
 EBUILD intel-compute-runtime-23.09.25812.14.ebuild 1994 BLAKE2B f1c6fe74a1849e190e99205219e20407ece6da07ce3d8dbd55291f17ac5b341ead62f5d6439e411d77de4bb1260f5f7b050071fc17e43b9ab52b414146f0744f SHA512 def2654a21df02aef8ec9b17b375b9243b155ef6568694dfc17a7ecc01b01944f68ffca502a71661991302d9b9210d5e42fe8d631dfdf9cf0bb9b326d9abda22
+EBUILD intel-compute-runtime-23.13.26032.8.ebuild 1993 BLAKE2B bd74ce81bb47b0d42f5231d0b0e0830e79e3662d047d65544ca44d4f475bc9064407e6f81aa103e30bc013383d8be6b85e5591c4723c79aa27c6ebf5ae23738d SHA512 56af9e2116e978d190d5cc23b05e6dbf4a5f0ca239f7c7849b5b52ead7d06cfd3a7235c2dc74933187682684215ab64be2b07e123babe0420d15a48d7c9c937a
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch
new file mode 100644
index 000000000000..0e4b6d1cdb47
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/files/intel-compute-runtime-23.05.25593.18-gcc13.patch
@@ -0,0 +1,237 @@
+From beaff2b7358706badc38743f012b5a6cd7823680 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Fri, 17 Feb 2023 17:53:57 +0100
+Subject: [PATCH] Include cstdint to fix GCC 13 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: František Zatloukal <fzatlouk@redhat.com>
+---
+ shared/offline_compiler/source/ocloc_concat.h         | 3 ++-
+ shared/source/ail/ail_configuration.h                 | 1 +
+ shared/source/compiler_interface/external_functions.h | 1 +
+ shared/source/device_binary_format/ar/ar_encoder.h    | 3 ++-
+ shared/source/os_interface/linux/drm_debug.h          | 3 ++-
+ shared/source/os_interface/linux/drm_neo.h            | 1 +
+ shared/source/os_interface/linux/pci_path.cpp         | 3 ++-
+ shared/source/os_interface/linux/pmt_util.cpp         | 5 +++--
+ shared/source/os_interface/linux/pmt_util.h           | 3 ++-
+ shared/source/os_interface/linux/print.cpp            | 3 ++-
+ shared/source/tbx/tbx_sockets.h                       | 3 ++-
+ shared/source/tbx/tbx_sockets_imp.h                   | 3 ++-
+ 12 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/shared/offline_compiler/source/ocloc_concat.h b/shared/offline_compiler/source/ocloc_concat.h
+index c53050b26bf..7a9c9ebdd4e 100644
+--- a/shared/offline_compiler/source/ocloc_concat.h
++++ b/shared/offline_compiler/source/ocloc_concat.h
+@@ -10,6 +10,7 @@
+ #include "shared/source/utilities/arrayref.h"
+ #include "shared/source/utilities/const_stringref.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+@@ -52,4 +53,4 @@ Usage: ocloc concat <fat binary> <fat binary> ... [-out <concatenated fat binary
+     std::vector<std::string> fileNamesToConcat;
+     std::string fatBinaryName = "concat.ar";
+ };
+-} // namespace NEO
+\ No newline at end of file
++} // namespace NEO
+diff --git a/shared/source/ail/ail_configuration.h b/shared/source/ail/ail_configuration.h
+index 95381289d2f..0d8b349b495 100644
+--- a/shared/source/ail/ail_configuration.h
++++ b/shared/source/ail/ail_configuration.h
+@@ -9,6 +9,7 @@
+ 
+ #include "igfxfmid.h"
+ 
++#include <cstdint>
+ #include <string>
+ 
+ /*
+diff --git a/shared/source/compiler_interface/external_functions.h b/shared/source/compiler_interface/external_functions.h
+index 1dbe54296a8..61873b466c8 100644
+--- a/shared/source/compiler_interface/external_functions.h
++++ b/shared/source/compiler_interface/external_functions.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+diff --git a/shared/source/device_binary_format/ar/ar_encoder.h b/shared/source/device_binary_format/ar/ar_encoder.h
+index f30db2589be..5b3ec9dbb43 100644
+--- a/shared/source/device_binary_format/ar/ar_encoder.h
++++ b/shared/source/device_binary_format/ar/ar_encoder.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2020-2022 Intel Corporation
++ * Copyright (C) 2020-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -11,6 +11,7 @@
+ #include "shared/source/utilities/arrayref.h"
+ #include "shared/source/utilities/const_stringref.h"
+ 
++#include <cstdint>
+ #include <vector>
+ 
+ namespace NEO {
+diff --git a/shared/source/os_interface/linux/drm_debug.h b/shared/source/os_interface/linux/drm_debug.h
+index 8e5180cb665..a86f55f0c14 100644
+--- a/shared/source/os_interface/linux/drm_debug.h
++++ b/shared/source/os_interface/linux/drm_debug.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2022 Intel Corporation
++ * Copyright (C) 2022-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -8,6 +8,7 @@
+ #pragma once
+ 
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <utility>
+ 
+diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h
+index fd8ab8e61c8..fd9a2ab726f 100644
+--- a/shared/source/os_interface/linux/drm_neo.h
++++ b/shared/source/os_interface/linux/drm_neo.h
+@@ -18,6 +18,7 @@
+ #include "igfxfmid.h"
+ 
+ #include <array>
++#include <cstdint>
+ #include <limits>
+ #include <memory>
+ #include <mutex>
+diff --git a/shared/source/os_interface/linux/pci_path.cpp b/shared/source/os_interface/linux/pci_path.cpp
+index 04ade097a71..2f7f9800111 100644
+--- a/shared/source/os_interface/linux/pci_path.cpp
++++ b/shared/source/os_interface/linux/pci_path.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2022 Intel Corporation
++ * Copyright (C) 2021-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -9,6 +9,7 @@
+ 
+ #include "shared/source/os_interface/linux/sys_calls.h"
+ 
++#include <cstdint>
+ #include <string_view>
+ #include <unistd.h>
+ 
+diff --git a/shared/source/os_interface/linux/pmt_util.cpp b/shared/source/os_interface/linux/pmt_util.cpp
+index 7b20b671be4..a8004a0ff75 100644
+--- a/shared/source/os_interface/linux/pmt_util.cpp
++++ b/shared/source/os_interface/linux/pmt_util.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2022 Intel Corporation
++ * Copyright (C) 2021-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -14,6 +14,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <fcntl.h>
+ #include <map>
+ #include <sstream>
+@@ -106,4 +107,4 @@ ssize_t PmtUtil::readTelem(std::string_view telemDir, const std::size_t count, c
+     return bytesRead;
+ }
+ 
+-} // namespace NEO
+\ No newline at end of file
++} // namespace NEO
+diff --git a/shared/source/os_interface/linux/pmt_util.h b/shared/source/os_interface/linux/pmt_util.h
+index 28ecad3f05c..374b4767185 100644
+--- a/shared/source/os_interface/linux/pmt_util.h
++++ b/shared/source/os_interface/linux/pmt_util.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2021-2022 Intel Corporation
++ * Copyright (C) 2021-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <poll.h>
+ #include <string>
+diff --git a/shared/source/os_interface/linux/print.cpp b/shared/source/os_interface/linux/print.cpp
+index 9562bad72a9..1cd173560be 100644
+--- a/shared/source/os_interface/linux/print.cpp
++++ b/shared/source/os_interface/linux/print.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2018-2022 Intel Corporation
++ * Copyright (C) 2018-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -7,6 +7,7 @@
+ 
+ #include "shared/source/os_interface/print.h"
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <iostream>
+ 
+diff --git a/shared/source/tbx/tbx_sockets.h b/shared/source/tbx/tbx_sockets.h
+index 9b7f7863f05..c00b1847bc2 100644
+--- a/shared/source/tbx/tbx_sockets.h
++++ b/shared/source/tbx/tbx_sockets.h
+@@ -1,11 +1,12 @@
+ /*
+- * Copyright (C) 2018-2021 Intel Corporation
++ * Copyright (C) 2018-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+  */
+ 
+ #pragma once
++#include <cstdint>
+ #include <string>
+ 
+ namespace NEO {
+diff --git a/shared/source/tbx/tbx_sockets_imp.h b/shared/source/tbx/tbx_sockets_imp.h
+index 738f26175b3..c8e2ac6f0ff 100644
+--- a/shared/source/tbx/tbx_sockets_imp.h
++++ b/shared/source/tbx/tbx_sockets_imp.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2018-2020 Intel Corporation
++ * Copyright (C) 2018-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -10,6 +10,7 @@
+ 
+ #include "os_socket.h"
+ 
++#include <cstdint>
+ #include <iostream>
+ 
+ namespace NEO {
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild
index 745b0dcf530b..ffb2b97cbbb6 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.1.7:="
@@ -43,6 +43,7 @@ DOCS=( "README.md" "FAQ.md" )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch"
+	"${FILESDIR}/${PN}-23.05.25593.18-gcc13.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild
similarity index 89%
rename from dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild
rename to dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild
index cd1d6df31cc0..42141f18aa8d 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild
@@ -16,21 +16,22 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="+l0 +vaapi"
 
-RDEPEND=">=media-libs/gmmlib-22.1.7:="
+RDEPEND=">=media-libs/gmmlib-22.3.5:="
 
 DEPEND="
 	${DEPEND}
-	>=dev-libs/intel-metrics-library-0_pre20220930:=
+	dev-libs/intel-metrics-discovery:=
+	dev-libs/intel-metrics-library:=
 	dev-libs/libnl:3
 	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.12812.26
+	>=dev-util/intel-graphics-compiler-1.0.12822.1
 	>=dev-util/intel-graphics-system-controller-0.8.7:=
 	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.9.4:= )
+	l0? ( >=dev-libs/level-zero-1.10.0:= )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		media-libs/libva
diff --git a/dev-libs/intel-metrics-discovery/Manifest b/dev-libs/intel-metrics-discovery/Manifest
index d8a6cce06184..b1d05baa945a 100644
--- a/dev-libs/intel-metrics-discovery/Manifest
+++ b/dev-libs/intel-metrics-discovery/Manifest
@@ -1,3 +1,3 @@
 DIST metrics-discovery-1.12.164.tar.gz 4235286 BLAKE2B f2a707fd2b43e096ad1c02032558c141add286d9f8cef20a317f5109245328ae7d22dd1acec64df99ef17dd652e67e5cba8db0e3271dd2259138924218ef893a SHA512 8e8e00d75ba14abecd9c650c0f5a33dd8f46396e8ed4f2a4eefb1b76b87cfc38ad47740dddd00698c09055a79e12ac2a4b23187c0b6146b4ef0745b21f0bf975
-EBUILD intel-metrics-discovery-1.12.164.ebuild 670 BLAKE2B 6044af22317271d78624b74af660b066eccd03904ea21596997f79afefb8b57aadc3b438baa68f6024eca8bf5f85344aa9b993cfbaf10f585300d921b7b43d26 SHA512 f8a25e7f653fa4d1ca3838e565e672f542ba522b7c45f8e1d0e41608560e3ddc009daa46cc5442543cfd3e0ad29857eeefba93d4676472dec4c240044fee29f1
+EBUILD intel-metrics-discovery-1.12.164.ebuild 670 BLAKE2B d35767c77eddca69ec8eaac475b864058a3b4be8423cf7a9fc46cef41298d27eb2b5f76f6646e415e5ac4e5073f77d360e2c915127a358c1077cf6f1c1b3a10a SHA512 c3c6d30bababfa66bfe1c8bad0268cf54b77734a33762b61913718b9a876d2e4291ca198dd3156d5d8980dc3463cc0ff24d26c6e69fd4ea5b8b4d043828d3354
 MISC metadata.xml 815 BLAKE2B 017d27f513969fab6dd984946f3105d8bf0f2c0f29251976016f3b4aff779a22d66ad876bf00553376314681c2ee33beb53c0537a37a80824692001710164c8f SHA512 76548770278fa9004b250a5e8e6b273e49a0aff112e3e1508653c8b4119ed7ec486191ab39f6d22c425b0b07d77b29fc299d36d8faa7167b8af564bb1418aa6c
diff --git a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
index 3b483c3c9bf2..cb6629bc91db 100644
--- a/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
+++ b/dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
@@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}"
 inherit cmake
 
 DESCRIPTION="A user mode library that provides access to GPU performance data"
-HOMEPAGE="https://github.com/intel/metrics-library"
+HOMEPAGE="https://github.com/intel/compute-runtime"
 SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${MY_P}"
 
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index b14847ba5aaa..0eb39524abc1 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,3 +1,5 @@
 DIST intel-metrics-library-0_pre20221216.tar.gz 245599 BLAKE2B 3b7fb9ed24e1f2bade6341b0e4ceb96ecf1edca9447445e19796132b85f0c10a83a11433db7b051a215f897c71dfc80f6545f19960ee9952908d91bc4a04f319 SHA512 403e3c71010bbb4499100dbf100f593f519600064c1a3027a56fdb003c2212b723e8cd91774bb00f97a1c0dbedfce04999afad1f93a8fb957680aa4a20d70a64
+DIST intel-metrics-library-0_pre20230417.tar.gz 248881 BLAKE2B 83b3fb48fcb01668bda98c3a5fff1829d89686dd2731163f24a43614ac6b21c2f618be9d2f80115e2ceeffc4df0880e2dfea72a9255d3430f60a88ecd66a8893 SHA512 1b5878528e2146c9811b43b74ddb94f14b1127dc0e6231cc4ff0993d528c8ccea4d9ba52a8e50b409eb9f0e9776cbe04df7c0d1e94a8cf7020b97b822b430c13
 EBUILD intel-metrics-library-0_pre20221216.ebuild 705 BLAKE2B c523f2a4799191aff677f2207cd171d41ac856c772e9e9520b036699de4f3b25506d054b4abd1b7afe4678aad2486fa6e9b104084b8b4fac018071561c4af300 SHA512 1373f9ccf19df03ecd5a6e21cf6cfc36be24b65837c16d561b8a328f491707f794d13cf675f5c0e6c11c5f223da117d16d1cf7f1e1ee57642c26eec2c6f6fce3
+EBUILD intel-metrics-library-0_pre20230417.ebuild 706 BLAKE2B bd35175afd782d5cc87779a4bbaa1f54e01428923b3916251909e4e98ea219e3141446d4844091eba09c1c9a7421bfd540e851eba3301e92bf114a00db08f636 SHA512 1cd0ccdb112c7e97512e7ed41c2f5a02846529c8f565dd43ea548e1a16b8fde45762b18fb4e58d2816fda65c8194dec3f797609f11101ac7eacbc33746ed986c
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild
new file mode 100644
index 000000000000..5a958bb84747
--- /dev/null
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+EGIT_COMMIT="5524ef74cf0423006992a52571590cb8bc2d7468"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake
+
+DESCRIPTION="User mode driver helper library that provides access to GPU performance counters"
+HOMEPAGE="https://github.com/intel/metrics-library"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0/133"
+KEYWORDS="~amd64"
+
+DEPEND="x11-libs/libdrm"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e '/-Werror/d' -i CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/dev-libs/ktextaddons/Manifest b/dev-libs/ktextaddons/Manifest
index 956121f4fbfb..c0c2075d8091 100644
--- a/dev-libs/ktextaddons/Manifest
+++ b/dev-libs/ktextaddons/Manifest
@@ -1,3 +1,3 @@
-DIST ktextaddons-1.1.1.tar.xz 213528 BLAKE2B 4b64b11fa9443a32c84972974c43d62a820c1af629d89ac87968c620e536a580da883f2eaa43d45c19d9957916130a7decea5487b5a70228dc670c84aba4037f SHA512 c09f7205a8c3d830af4dd32f152c8496390edec2cd1ac42398cfbfdb398c38a27ffa81e85962777b467eeff1989ed49dbe6013e97208ff45745ea71d8a750e4a
-EBUILD ktextaddons-1.1.1-r1.ebuild 1062 BLAKE2B 5a39d48b83ee750de5b96a3fb19c21644f5693490e87a224cb306f637565ddf136eb3c1b8bd1d62e7eeee85c7fcb36e23e9000ee5d248c34dcff14d4b282c8f2 SHA512 4dbd2092103c9ed4512f9972c4553c2cb12b858fc30836aaee51a4fe1f7fd598fb9847578d56df08d8d73319447025c548be6f7ba267308754fdd5549548c223
+DIST ktextaddons-1.2.0.tar.xz 321812 BLAKE2B 14d97e7983fac52b5ea281933df5b237e570f8fbb1aeb963e0df58fcc05dce8c5c7486849316ec675547ed797f090d8a48a95d5ab21c4bc4d90511e8a6f8b613 SHA512 667ffe7408c2fbd0d47f4db964fcc5181de01d2bb4ee047949402baff4d0768e04cc62a316e07dfc8c015a9d2b976508fc27ac17864a903e99b4153855e8f367
+EBUILD ktextaddons-1.2.0.ebuild 1062 BLAKE2B 5a39d48b83ee750de5b96a3fb19c21644f5693490e87a224cb306f637565ddf136eb3c1b8bd1d62e7eeee85c7fcb36e23e9000ee5d248c34dcff14d4b282c8f2 SHA512 4dbd2092103c9ed4512f9972c4553c2cb12b858fc30836aaee51a4fe1f7fd598fb9847578d56df08d8d73319447025c548be6f7ba267308754fdd5549548c223
 MISC metadata.xml 533 BLAKE2B ad3c9ed5eb355091e9b1073118bf8cae793d17c12f0f1595660090834425d0cca01fdabc4ea868525e64051d35632de55caf8c0a10f1b413bf13baf55d2a7440 SHA512 36d4bfeff8d64f1455a8d3d8a5040913dd400ec2a469a03777e02b812a40806ec56d20a0e6dd4e05e5efde2342bb4007c027d562517929f07aeb6f713e895935
diff --git a/dev-libs/ktextaddons/ktextaddons-1.1.1-r1.ebuild b/dev-libs/ktextaddons/ktextaddons-1.2.0.ebuild
similarity index 100%
rename from dev-libs/ktextaddons/ktextaddons-1.1.1-r1.ebuild
rename to dev-libs/ktextaddons/ktextaddons-1.2.0.ebuild
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 5fdcd401b5b7..45e38557c26c 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -1,4 +1,4 @@
 AUX libcdio-paranoia-2.0.1-pass-NM.patch 3534 BLAKE2B ba200b7245b7a39a43275968d1b8f9f54e2abf22080a069894468da6a0e2911ad5307f12ae99fb6c60c4db3c316d327c466cc32fe002404e2c1f62c4e8505afa SHA512 e0b263699249e7d873b2040373419d395697cabf02d61fdcf576d162bde9b232caf891354c2d560767d5044c14cea48401453cff069c5f3c33322c25f97101d1
 DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
-EBUILD libcdio-paranoia-2.0.1.ebuild 1855 BLAKE2B ba79098540828c612aa22172b3ddf4e477fc9df4f77eab3e5c515e494a978e3cc9b5bdb329645d97768303abc79c549e6595a2ddea7b3d2d71c5843677b4af18 SHA512 c03c6eafdc345dfd794a2e2996d8e4cd727b96c85a41c08ecd00c741aaab926d2d47297959e58b5b44cedc415487a5d77b1bbf78d02ec81803d8c33faa934016
+EBUILD libcdio-paranoia-2.0.1.ebuild 1862 BLAKE2B 0b4b530e75a4517a8e6b7024379ae277f9c2f38395aee4c1ff7058593cd348280acfb0baa7bb544fb1e9c994e21f8e1e5af50cc6224c9c15e269b73cf0c2d979 SHA512 2be3e06e3faa83846dd5a7fade555fb2f809cd88809623aca4a942a62b322b6fe23d6c59c6f72ba99693fd22af9dc609237d5519d0ccf65b3c44d51374af09eb
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index 2492b4825207..068bc1a9638a 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index b6b41ad3a131..70598f8b9d67 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,4 +1,4 @@
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-2.1.0-r1.ebuild 1790 BLAKE2B c8a1d715145415341fde11f1332fa7411309ccbae321f5024075ada223f10787210df23f6269cb38dcd0a9aa5925afa49d032ba8f3b3105c733fcf58063a1c4f SHA512 d37e8ad83cac1d7893b4e5e60fc186dd7cc557ed6b767f63747b1e891b7d4ae64b344955a3aacb0e83b0ff6410b949a2ed0ae68e7c95e06466ba40dc5a10695f
+EBUILD libcdio-2.1.0-r1.ebuild 1797 BLAKE2B 6af5f07fdc57ed00792c3c86434fe372f41034b901437418c4647089d013c8851552d62d25215a88afb7ef4b38d40116dcceb9f4a4b4de78d37fd909f6377a8d SHA512 c50518fff05c3a58e08884357a1a603ffec068059b2d67670f407ccaa8ff6e633c19f87cce17dad7157c98e9057b4ecc0bfaa23a94dd06fd8d15a988da1409bc
 MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index a2f4805fe768..63952d9fe968 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libchdr/Manifest b/dev-libs/libchdr/Manifest
index 3059b0d03549..6769e43da51d 100644
--- a/dev-libs/libchdr/Manifest
+++ b/dev-libs/libchdr/Manifest
@@ -1,3 +1,5 @@
 DIST libchdr-0_p20221129.tar.gz 1748187 BLAKE2B bc2f03d558e0f208ae3c51a53b2bbf630fb4cc502c18d83b31f184cf2c2f59e06dbb88c5399e01fb5f2436643a5095256bd31501a1531a043537a05c45c27be3 SHA512 4a72dcb376c451b74389650e121de06daae7cf0b293d7d66a8f7acf1b4f83355a2467a2d77e0953331ee5fffa243f713efb0878bb509384715e9c42a567a9b90
+DIST libchdr-0_p20230230.tar.gz 1748513 BLAKE2B 03fc5507b7f598995fede477f26c8ab41cd16c658e4ca5c193e581840f14ead0db4ab8da3b888a2e03fb4c78c19af0f08cbab9feefe488dc230ec0fbd3941a91 SHA512 c25084b2257083c4bddd84d13e3dc0d30fea548a4e50a6beefd5282383480eaaa293c044647e2aff339d087dae87c3ef871137a43db766e08a1dffd8801c3367
 EBUILD libchdr-0_p20221129.ebuild 601 BLAKE2B 001f0c6be7d3a791170039f596fee04db2fea5d6e70e9688890ec5ed096affb1e7bcb1dd10e14a1689b3595441773696ba1aa024106f6ea3106e2df9a279ee77 SHA512 3aa39756cc6cfa74f739b4d7c5f5b5ea71c2ddedde8d69bc737ef25612459256ee02182da3067e31b58a27a0d3d5195d5918c864664933d846552854819cf58b
+EBUILD libchdr-0_p20230230.ebuild 606 BLAKE2B 6a3bd39078d52da00a1f97e4f7af42c64e23101062ef6336f19efa26b5ebc098b7f8b98ad504afcddb9f90399ebc58d215026287669d6d098bbfb1ec907ace7d SHA512 68e28e766360f69e2535e53f43f512fa17e032c8e2a13c78fbb5a1475eca05a754b56606874d96ae021a47be2641c63d35d6416582af9088490a69572e3eafbf
 MISC metadata.xml 327 BLAKE2B 20c6d3bc61e288afbfd5b0d7d6bb641dc2214d9221b1c2b69a69de676042994bca2878c855b92fea7b5aca60e6dc687c55f0e79f4db13d579332a3d15991e211 SHA512 31e8175f36df91d1bc81a2351a99deba53cb57cb08e6e0e5ad65e17c53cd1cb1b1565b943f2c881bd3e11df45c6ea518f3eaf86335e10d816078161bb23d284b
diff --git a/dev-libs/libchdr/libchdr-0_p20230230.ebuild b/dev-libs/libchdr/libchdr-0_p20230230.ebuild
new file mode 100644
index 000000000000..45f61ac9698f
--- /dev/null
+++ b/dev-libs/libchdr/libchdr-0_p20230230.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+HASH_CHDR=fec8ab94212cc65d9d9a62cb3da924f5830c04b0
+
+DESCRIPTION="Standalone library for reading MAME's CHDv1-v5 formats"
+HOMEPAGE="https://github.com/rtissera/libchdr/"
+SRC_URI="https://github.com/rtissera/libchdr/archive/${HASH_CHDR}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${HASH_CHDR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SYSTEM_ZLIB=yes
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d2ce57514d48..7bc9e281837c 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1667 BLAKE2B 496db7dddd88d6aba0a9bf96b9b874022da60073993b456316fd391b9c0ed76134fa4af3cae20df64af47884755aa68ea586fe4410d5a4eeea86b51a99566dd7 SHA512 155adf1cacc694b7a1c4d54b60ead79158796f56b5437109f7f6262c8d40d79181c2d78ec3a2028b5159973ae42da6ca85e159fb95818dfdfb6e384be7fdc25f
 EBUILD libclc-16.0.1.ebuild 1658 BLAKE2B 3aeec0820378ca3a425503c191138f4d938a624f503f13a73e8aa59ccb31e3e26b1d46092d04b150280f9c9711075bf8c58121421926a79d5a1b17de56ddee7c SHA512 fee4b9aa4b8652deb16bc2c2966caddf4233778c451b00ceac089f5fae2adb95c592b4323c8dcc796a3a28432e9f518343e06e9dd41b393272acecd7e1ebae52
-EBUILD libclc-16.0.2.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
+EBUILD libclc-16.0.2.ebuild 1658 BLAKE2B 3aeec0820378ca3a425503c191138f4d938a624f503f13a73e8aa59ccb31e3e26b1d46092d04b150280f9c9711075bf8c58121421926a79d5a1b17de56ddee7c SHA512 fee4b9aa4b8652deb16bc2c2966caddf4233778c451b00ceac089f5fae2adb95c592b4323c8dcc796a3a28432e9f518343e06e9dd41b393272acecd7e1ebae52
+EBUILD libclc-16.0.3.9999.ebuild 1647 BLAKE2B 3711c9e847206a4eb82851d577ac3c90bb58361ab1d97e0ae1bd084a15b76311cf35b6eaf30a45cb78c1c22d318f5dc27cdb9df4e51effdb56fa096f6ffdb1f8 SHA512 5303f1404e478b766028c565a3f9a5bfc8655f0d71ebcdf5197168acf1c85e1731edf8fba9bc4bbce5d9999086d797b059ea46cc00a6e706d092f3bfefa34eca
 EBUILD libclc-17.0.0.9999.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 EBUILD libclc-17.0.0_pre20230325.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
 EBUILD libclc-17.0.0_pre20230414.ebuild 1725 BLAKE2B 6af25c457993cd3f87b7fcb43a3824d43d7e57a3208270982dd7cddef72282c99d40d729041157be22b3a638613f1cdc8b43ddae8d19af05b44395cbd28404c8 SHA512 28079adbb36dbcf7beb4069afc4d10e505ae5ca74bbecda5b91c4641294d646a253dcce79149c31b90fa8c241f2155a01ff8f5b0f4d553caafa3412f2b9a20a3
diff --git a/dev-libs/libclc/libclc-16.0.2.ebuild b/dev-libs/libclc/libclc-16.0.2.ebuild
new file mode 100644
index 000000000000..6964547d373e
--- /dev/null
+++ b/dev-libs/libclc/libclc-16.0.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=16
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libclc/libclc-16.0.2.9999.ebuild b/dev-libs/libclc/libclc-16.0.3.9999.ebuild
similarity index 100%
rename from dev-libs/libclc/libclc-16.0.2.9999.ebuild
rename to dev-libs/libclc/libclc-16.0.3.9999.ebuild
diff --git a/dev-libs/libdispatch/Manifest b/dev-libs/libdispatch/Manifest
index 3536ba394993..b66e35a344be 100644
--- a/dev-libs/libdispatch/Manifest
+++ b/dev-libs/libdispatch/Manifest
@@ -2,6 +2,8 @@ AUX libdispatch-5.3.3-musl.patch 1213 BLAKE2B 76db17275b46160840867ae2956b58f38b
 AUX remove-Werror.patch 1217 BLAKE2B f7ef18089abcd11fb8ed36980e681a804649b8ad8891b97113966c099bb05178604983359b79eb853ad6256a6c116fa8fdca116b29e2d6108c2a38fff01472a1 SHA512 0c17b1b36a02b401182a91e1f751f71b343f1d61ce7340230fdb13e89354316d0f2863fc3ea2f1a33bee6033c79e30e35024519c515a03a4d88467456ef340cc
 DIST libdispatch-5.7.1.tar.gz 594292 BLAKE2B 67112558b591c6c5f658f31ac7f48cea3eb84bffda0959663cac808e80b593f127fb85dc0a666a6ea636bc70649dd9a9c31cbd619fa0e41a803a2766a4740d85 SHA512 7f04c14cfba214d99ffbb1d6d5ae2d0b83a0e3d3597c886093993f55adef53995477d9d88207ad36facc67cd36c46e1380f57fdc847f9a5f079aa41b820ecf4f
 DIST libdispatch-5.7.3.tar.gz 594295 BLAKE2B 429a5bb52594d4b1e8f3f59c83d88f6faa237acfb4cc24a7e546d95cb3f4559d3e4fe6a0ebaa53ca58f115213bbbcee89081cee91bf3a3668947477807e2f310 SHA512 7d8f40ff7a43ac0367552855317e73e140ba7ff7d2b6494aa772ba052fd7d1a151b0122465b6a82a7e4483e8dd951e77d6b626d63e0997c9a64e3a2bc6d66250
+DIST libdispatch-5.8.tar.gz 594259 BLAKE2B 90853a19c4c99f590bef9a2153157d95c08f97dd234377f6fff488f6d09c9abebef06e4b64512ab1add1ee92912498cdbab44af7ce2c91a0460ba26c452a5b22 SHA512 913885f00c2010a88ceeb2f9414f2b39e9884ca3fd58e927248dcfafa2205560468114de5627e1225d23ea9e3a50e39670b3afd03defba3de54268653888c32c
 EBUILD libdispatch-5.7.1.ebuild 1190 BLAKE2B 902372aa7c39ff6c07cce23794ad3b2dd86e78b60c19160faea5406316eb72ae49a80648b540c2d4a62a41a62440fa791ee8f795c7303bd3a11d34981557ce0c SHA512 4e0bc2cacbb0e1669eba0231d4e63c64b94db9f274a752de780d9daf881f97cde30bd7b6fc098c90ea5a1c718f937df0d8a8fa463cd241c87dc8a315fa8cbcf3
 EBUILD libdispatch-5.7.3.ebuild 1193 BLAKE2B 481942712b122684fbb980e42a2564e12add76c6bfc907ea869e89fe9437684c57b827149228a9253b2b11463d23cb8174cae4f56808564bc6b85ac887f9e34e SHA512 3f3f90082ceeae63e52110310230937ca6e3c74c9695a5f2958c2c84efe1e7ae015d15d259f5266fcf5382309c2a4e5d50270bf96bc86dcb55a9b63242f715ba
+EBUILD libdispatch-5.8.ebuild 1193 BLAKE2B 481942712b122684fbb980e42a2564e12add76c6bfc907ea869e89fe9437684c57b827149228a9253b2b11463d23cb8174cae4f56808564bc6b85ac887f9e34e SHA512 3f3f90082ceeae63e52110310230937ca6e3c74c9695a5f2958c2c84efe1e7ae015d15d259f5266fcf5382309c2a4e5d50270bf96bc86dcb55a9b63242f715ba
 MISC metadata.xml 350 BLAKE2B 179ce6945eeec3c78414fb6dd66822f26ac6b629528da5868b44d3715355ec80acb1cc5dd8357b659f31877c83bfc10ae8b236367904bbbdd36d2ec7c1458739 SHA512 64646993f5469b2573385aa94fa578ae0e7645f4c5a30b631cf1d0de9ac5ef88270ba85e95f684b884631ec21d7ef31c4d68b563923901651da2ec631b0ccff5
diff --git a/dev-libs/libdispatch/libdispatch-5.8.ebuild b/dev-libs/libdispatch/libdispatch-5.8.ebuild
new file mode 100644
index 000000000000..95454fe7e805
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake toolchain-funcs
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!gnustep-base/libobjc2
+	!sys-libs/blocksruntime
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/remove-Werror.patch"
+	"${FILESDIR}/libdispatch-5.3.3-musl.patch"
+)
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake_src_configure
+}
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index cce4d3ff5ccb..1db9fda5aaaa 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,9 +1,5 @@
 AUX libtpms-0.9.0-Remove-WError.patch 508 BLAKE2B 33178598a1fef1189039c30814996f00ec37215b3f10a0ff9df521a866147b2a6844d86c3b372e450f701e6e2ae3e587443765c39848076536861342e5b42d63 SHA512 e0d55045bcb667278dc1ae1c509b7be466f23421683f8b0b7c830d724f83b1923b09a61f2a8e649e08150d1d313f0456cfc5f5a1b5fe3bf168565e443595dd12
 AUX libtpms-0.9.5-slibtool.patch 1981 BLAKE2B fa4adf1c063d24a2550f964dcaae1ea2e2d93f7d2704bc00e29ef22ceecaaf214860e82e668e1358854482fcf3ba1af89745422657763b7683a232f7e286ac7e SHA512 4b8eebc895ce6941a3ad5995ee0d5f1b1537861700878fa1ce0a95ec37ee1d51354782da4bb2feeedc1c5871aa62ec248484b409c6109bed95cf73962ff8b206
-DIST libtpms-0.9.4.tar.gz 1264030 BLAKE2B 56731b913145afcd49fae13f0fcbe4fc147edf206a44849cef45ed34a7644f0894bb6ab5dcb72d620eb1ab121bf4e821fe7893557508af394585171133d659e2 SHA512 ae3e2613bc31d98c10def546c70d0c25bd1246af5090268afa0411502bfd0e454967046ebcd9025350976817441e595fa4e21562f800285db98331e4c2743505
-DIST libtpms-0.9.5.tar.gz 1264086 BLAKE2B 3e6da08dd31414bdf19260f47fce6ba7ace0ae72b152b681f1c1fbc9d75b7708238e5c2a161827c7a6e2b9a6ae4786dfbf921ec37b9f0b7c044835c974a111a3 SHA512 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
 DIST libtpms-0.9.6.tar.gz 1264338 BLAKE2B 7b127ef370a48214814bb9ad0e8461ed0af21f32ab84f243945980c5e36ba5e374b4de7a83bf9c67c29264609063d48eae2dae83832daed70170bb1ed39eafea SHA512 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
-EBUILD libtpms-0.9.4.ebuild 1299 BLAKE2B 6c78609afdc5385a842da2f415ef918475baab3da737cb2e43c72cf5d2aaa382dd84b4157e4b52aa7fa5f44de6db48b37f680897baabb006d923589d4ca39552 SHA512 f54857978f2f4d021055406f2f2f480f3df97ca57cf29b1967389107079cbe37551ac8717c03fdbf38cb4aa64b5567a87f27bd2ed46edd0243d076c06689f3b1
-EBUILD libtpms-0.9.5.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995
 EBUILD libtpms-0.9.6.ebuild 1357 BLAKE2B 21ecc3c6e03111c24c5b06f2698d980c1f22e69de41f42998ea655bafc48a8975feb32ad7b85973216fa444b7dd193bcbd9d7dc0f8cc0f7f526fab011cfa8f23 SHA512 d8a48b47cb8ca9cb13b2d8dba29692d2ad14109355a063216febd81b256f88bea5c007e9f9fa9d07d6c562fba3bb27d9d63a313e8ccba7bb78f8df1a9be5f995
 MISC metadata.xml 621 BLAKE2B 5431a08a57b654746f41820560912e2bac4fc0c5cd2eb5f44c77e4eda65c1a160845205c3ae76392c4a6f9aa33562999576c055ee6d1b89579a9e2a49c59e4f6 SHA512 5e9fff7be647a2e9e8eb71dadcc6b8cc8577ade658fd4ab8ba20cfd64f1b5ba129fc7e5f8fcfb52e69a646681741079c0bc85b06a92f9086ce66a28770c1a9da
diff --git a/dev-libs/libtpms/libtpms-0.9.4.ebuild b/dev-libs/libtpms/libtpms-0.9.4.ebuild
deleted file mode 100644
index 3b5f046772a9..000000000000
--- a/dev-libs/libtpms/libtpms-0.9.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-Remove-WError.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
-		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
-		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
-		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
-		elog "TPM state file must be deleted and a new TPM state file created. Data still"
-		elog "sealed using the old state file will be permanently inaccessible. For the"
-		elog "details see https://github.com/stefanberger/libtpms/issues/183"
-	fi
-}
diff --git a/dev-libs/libtpms/libtpms-0.9.5.ebuild b/dev-libs/libtpms/libtpms-0.9.5.ebuild
deleted file mode 100644
index b78b99d4a24a..000000000000
--- a/dev-libs/libtpms/libtpms-0.9.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.9.5-slibtool.patch" # 858671
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
-		elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
-		elog "keys due to a flawed key creation algorithm. Because fixing this would render"
-		elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
-		elog "TPM state file must be deleted and a new TPM state file created. Data still"
-		elog "sealed using the old state file will be permanently inaccessible. For the"
-		elog "details see https://github.com/stefanberger/libtpms/issues/183"
-	fi
-}
diff --git a/dev-libs/mdns/Manifest b/dev-libs/mdns/Manifest
index 2aa31e8c4aa7..d045891c45dc 100644
--- a/dev-libs/mdns/Manifest
+++ b/dev-libs/mdns/Manifest
@@ -1,4 +1,4 @@
 AUX mdns-1.4.2-timeval.patch 247 BLAKE2B 322c8204f5fef40dc6faeab14ac218f4b1a2e8d2a29272867bfc6ee754a2db6dee200bca6bbb433191adc321b99bb4feae0f5ec0adc9c133e292547d36b804c4 SHA512 3abab841c05a585e53c76c00819999d68e67d7436668cb8e77e17eee2166b5655809865c6cb800cae2df3788cec1f694e54cf00f81f45d0381e1b648d69f7f73
 DIST mdns-1.4.2.tar.gz 24743 BLAKE2B 6d360d5485ac9b3f284f2754b2bcdc6bba3fa2cf554deb0cebc9e83e2691355a32b81311cd313f2a5ad4bb650d1759967d299fc88a69f1793c50203c820ddc7c SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6
-EBUILD mdns-1.4.2.ebuild 413 BLAKE2B 70c9227ec947c0fddf4c7610dd4e57af8837ad0cdea14615d153aadfe60b4aff2fae8f67f211796b7eb66e452b972c33ebd120cd1e97592fdac7bc2a227e6ee4 SHA512 5c06021e9869905768430732571848e1bd8c7df0559abf783fc09649e94fa8a66307a5e927ccd7d7a3b98787457139a8d8bfef5e7fced54ff0a185ca3a5d5907
+EBUILD mdns-1.4.2.ebuild 420 BLAKE2B 1e65fdf420101ec37bd6b2e56d663f8cd380d2d3b8cb8a07c8eaeb06680019c0a46fe76b29fb30211310d0392b372a7e2b5996fa4fab3739b14bb484d84e4050 SHA512 ff5d1396aa241863857a2551029716bb90403afe06655dff812ce2866f71ec0cf4bd47fc1f720c1f87238b006a6768fc10970725afb96407706d0051b29a55b6
 MISC metadata.xml 646 BLAKE2B e9986d7a6ddd7e09a17e3b55097073fab681dde8e7e77ff52a80be5082fa8b44b23de91b67869a674fee44391fceab27f183d60216c2b29b9e3630eb0154c3bc SHA512 9f0dfeab4fb1c9227c82ac62f407347aed4a2bab392c5ebafc360b3e78fb80979df005d81ab863b7d63115f95ab6a5b1e5c695115b50589da90aafc108cef4b8
diff --git a/dev-libs/mdns/mdns-1.4.2.ebuild b/dev-libs/mdns/mdns-1.4.2.ebuild
index 584e38838699..4e537b3558a6 100644
--- a/dev-libs/mdns/mdns-1.4.2.ebuild
+++ b/dev-libs/mdns/mdns-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mjansson/mdns/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-timeval.patch"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 3a4e85c6d3f8..3c657d92f3dd 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -8,15 +8,15 @@ AUX openssl-1.1.1t-CVE-2023-0466.patch 1719 BLAKE2B 77294d1820a935e653f254600eb2
 AUX openssl-3.0.8-CVE-2023-0464.patch 8888 BLAKE2B 4a4c71e3dc3264ee2da59c9848bd79f700d9923cfc4d0fe26b740625263a1f47d0ad1a6dc3ecc060e6e7f94a3ddb90e80deb16850471d166b335107c48c3a7d0 SHA512 dd22e945312604f45bb55f2e8cfe485f4c7a47d7c07d746117baa580d61d25679d410043ff4243b62390176159ef4e3f40f0e2d28191329d3ad11f3bceb67294
 AUX openssl-3.0.8-CVE-2023-0465.patch 1725 BLAKE2B a226cc9f74188da651b910e6bbb56f9bfe445ecb09cb094dcfb182874470c5562a00959dc38ccbed2f0d48fd672491b4b423ce7252e2bc5d334c8c8ba999f655 SHA512 f7cdebce1af1cd89e8d1cc17834cf998f2b1a7587807b06887036abd5a134c79f25adacc94b9f2c5e4cda634fbdbdc7f76256e4653f5ef278fa18ea7c5023f8d
 AUX openssl-3.0.8-CVE-2023-0466.patch 1839 BLAKE2B e9a573317c92abe5e084a1c301f87443f54d47a96967f66e2dba103f8ff88f3452b5926254bbc4fdfb249b0dac530d6382504f77c0e81fea13e30398a3f8561a SHA512 35d64774eb784753ca90e55c72978e01e1b21b13255a51f27d4c8b34865a9509d24e9712abc42ef597b496a44a8ec6c17cd92768ebd335e721f4da0f7b40a45d
+AUX openssl-3.0.8-CVE-2023-1255.patch 1285 BLAKE2B 1394f50a82f01cd26e59ae241b4db60f73742e6d901a66e266772d0295eb2b7f3d7f53cbd2052fe9e81cfc251613cbc2394182b4813a5ca92e79c340c7f2b582 SHA512 df79750e82db172a1b0f61b7324442eb4b097f636854853d3229e3e970fbbdd73ac4094220d0745ecf00bdbb7fda09d7c0effceebbbd424df44af693aeb856a7
 AUX openssl-3.0.8-mips-cflags.patch 1104 BLAKE2B 39b3698ce27758504aa64b3059fdb51876971f085850719c4ece9e068c975624c04a39652cc77446de1241aa1d816eb282cd969efd70dd5c5d682c84f6a9224a SHA512 ec0a860ee504281fbbc33dbe35f9f31b3c8943a144ccbddc75c36c89260793760b42efd6b7c27c51fbab059588fc784dbad39c5b5f77202bf13a263441766216
 AUX openssl-3.1.0-CVE-2023-0464.patch 8888 BLAKE2B ef5c66bc6c06fd6e9d69ceff9f204e5944a1e73760e42bfc8550b197b674b34d273fcc9efa8a5f1b21577e8acc849548595a845a7f569a9ebce8ae0223ebb56a SHA512 e6b8f7f855ef880fcedba6e93971b1f894981e81e830d600446d560c2d83a8f8b2595a30ec0f7f0fdf1fc787b817d1d44700aa72203027a157beafdc0ec6ef19
 AUX openssl-3.1.0-CVE-2023-0465.patch 1725 BLAKE2B 7fbf508304c257ca5fc58c6b80b567326895d5b86a25fcfbdc058c6d21d9244b3a55150436084b15184fac267c001520664c02bb7f7151b61acd8da47113df27 SHA512 5e1525dff539eb06f3772166cbb6f20162b2c7de12633616663beeb75f5e8e5d964b66364b82dbf993d0622b741dba1930f27ca44f9563c0d1ff5915e6be93ca
 AUX openssl-3.1.0-CVE-2023-0466.patch 1839 BLAKE2B 166c660e40f3a7e6f7a87d673e1c94ff93494a6bfa9c061ed8e1ffc8d396d83043803c9ee4f277ffacab9132c9a941c5d51b7079cd07264d20724e2f83e54ed2 SHA512 e7cfb530fcec4712f076cf70b44d20576cd9a56e7904499f6f8d7413bf2565ba591317ee843c1ee074ae0eae61c26178689677dc3b0261af1426986812f9016e
+AUX openssl-3.1.0-CVE-2023-1255.patch 1285 BLAKE2B ca2749def80e8349db45260a397249229816ae226e7138d64a720bf43f81ac16b3a240b3f5e55e1878a05f5cb0ca2ffbdaa76030ea969e8e51d8b682008d9084 SHA512 cebf0c073d477556bdcafdd545bf39e2f4db2250c10b6db94628b9f46a6bcce877e281132693c3451766ce784629ad2f3863e02d42375d1de9afb72015512548
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
-DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc0052f024537959c4ebe61528988f235d661244fce6967159a876dd038c817bad19df742e828ca1cbae97ce6a4124bb SHA512 2ef983f166b5e1bf456ca37938e7e39d58d4cd85e9fc4b5174a05f5c37cc5ad89c3a9af97a6919bcaab128a8a92e4bdc8a045e5d9156d90768da8f73ac67c5b9
-DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
 DIST openssl-1.1.1t.tar.gz 9881866 BLAKE2B 66d76ea0c05a4afc3104e22602cffc2373e857728625d31ab3244881cafa91c099a817a09def7746bce4133585bfc90b769f43527e77a81ed13e60a8c2fb4d8d SHA512 628676c9c3bc1cf46083d64f61943079f97f0eefd0264042e40a85dbbd988f271bfe01cd1135d22cc3f67a298f1d078041f8f2e97b0da0d93fe172da573da18c
 DIST openssl-1.1.1t.tar.gz.asc 833 BLAKE2B fc5e7069268e987a20241dfc4f080529c6e95e217c198568b09c833e390e68b25a604a5d3ec29c6a64b9dee9d42199fd3647214e536ba2f7b8b4e57aa4cba680 SHA512 1232a94fce991d62f008ae6d3d9b6fe68cb6378fe07450feb17a58eb2417fb385ffcb7e6b74eb683134be9ff6ccf6efa183f37f4dd521614fd5aeaddf000b90b
 DIST openssl-3.0.8.tar.gz 15151328 BLAKE2B e163cc9b8b458f72405a2f1bde3811c8d0eb22e8b08ff5608ec64799975f1546dcdce31466b8a1d5ed29bc90d19aa6017d711987c81b71f4b20e279828cf753a SHA512 8ce10be000d7d4092c8efc5b96b1d2f7da04c1c3a624d3a7923899c6b1de06f369016be957e36e8ab6d4c9102eaeec5d1973295d547f7893a7f11f132ae42b0d
@@ -24,14 +24,8 @@ DIST openssl-3.0.8.tar.gz.asc 833 BLAKE2B 1949801150e254e9be648f33014a4a16f803b4
 DIST openssl-3.1.0.tar.gz 15525381 BLAKE2B 9212a7fb13f6dee7746721ee406af56ae1b48ec58974c002465d2b0205839eb5ee0483383aa9924fc3e4168ebd34e1a5819480cf10aa318994d7171e54c07108 SHA512 71cc75c7700f445c616e382b76263ad2e4072beec0232458baf3d9891b8b64a7ad0cac4b4d24b727b2b7dcd100c78606fd48eba98a67eccd5f336e3d626ca713
 DIST openssl-3.1.0.tar.gz.asc 488 BLAKE2B f4a844e3db2c2bdf42b6f811d16cc2077cacf713d20474d94e2d0180a6f97eadf4f03522e9fed478d263d680d88091dc2bc48e7ebb15d049bc57ee7ed64c7fbb SHA512 8d542e6471b745822d6cd889c5b168841b4366ee9a96edc2ab5b44fa1bd1b75308422aed312f1bd6e6a3c3e306eceaa95ce9bb4d0aa3e8ff86cb0fd92a7e61ea
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
-EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B d82db58beebd3eba272016b0484a148591c9d273b520dabd27c80e2f078a8a86beb0374ac2a19a6237fecd0e3e8d2a6d2a387edad4344865ead73869ae8f198b SHA512 3705eb236ead5c896ccb0e0165b48027bf6bd6bedcee148dc7d1ad53e2a787bad4e430c1d3868c05fb866628fb40675bef8bcf64e377e81ae601f3fa7ca4956b
 EBUILD openssl-1.1.1t-r1.ebuild 7974 BLAKE2B 1323ae4f56c9facb31f4487dced3c22c7c3f31dad6e420892dc6c5d21cc2d059f4ac5e6a4bf1e924b754bbf0e17dff96bb1ec3cf6a7f8e6992baed7a5c98ef05 SHA512 6b49ca3c7efeaa0230640bfea56eb1f038aaa0ed86b9e91bc7f67cee683e80d6bd6bf1016ad465e5720247056c8b1150d1aeb879f1485e1f0964b5ec5fd105a0
-EBUILD openssl-1.1.1t-r2.ebuild 8032 BLAKE2B 78af8d673a7ac80ca9ce186496f44b662696b72171888643ddd3cd7fdea94a9658f541c79cb26863207da395db9276a6bcbaa838867e20da5ea0602712b4edcd SHA512 085963d07dd99c4a10539b10cd212d39f2438c81a3337f10803094907c4f7197591e67eeb5962c54ab6055f5f3a6aecd90bd292b4965bd143bc1b242121c4d82
-EBUILD openssl-1.1.1t-r3.ebuild 8391 BLAKE2B e33ab4145cf96365cfe489a2674f91367c5da7362d348336625c9b3e3178657e419c41306b92614d0162baf343d9cc79934e573c3c9f1ae94527396710697bbe SHA512 8db9136855b12f5a84000b2d5eb1184d63deaa433e5367463a6c90ccb773816004a2b99872367218665407b20bda6f9a012ee485b4428c4bc3f1e949b4490c64
-EBUILD openssl-3.0.8-r1.ebuild 7789 BLAKE2B a5a3eed08b0c4196e38849abd2f37c90f177f7c350f83064632934c379038e977e7519da2aadb62b7d15dc634cf26c8cf5bdae9aab0a4ddb6f4d1f0dbd693025 SHA512 b5e20150d2b93214303d70f73f7593f098bda3876e21d46e49c72000bd7161a29c3166908ae9f0e8af8efb4e127801dc0c7c962391499f9d46e74370ead17d2a
-EBUILD openssl-3.0.8-r2.ebuild 7838 BLAKE2B 437496ddf1bf7d36c83e40f86e41d5ba5d0ce210f0162521c3df5d2011ccefb94c42021ba7d326824fc64f1b30fe0edc569f586552f43ce054a57aa82b9d4290 SHA512 2dc102202843d437fda0f2121ddfac2b15504129878bb40e2354638ad0b1b8c7e1fa81800491147961af6237022672f9ee47457cae0da0e62da3a6802f709398
-EBUILD openssl-3.0.8-r3.ebuild 8195 BLAKE2B e8510784cf26533644b19638eb112d4a9e9b54ef8b2c4e80673d85d7c750281e1449b263f428da7f080909355d017149a1920eaf1cfac15aa101f42ec4eeded4 SHA512 0b37b8ab4f25a1b846b87d825412c327a9fa08244325f8ee96567c366a004784cfb27764b3ffc06b5947c74416840263ea28a9f66bb095d376755ffdbac2afad
-EBUILD openssl-3.1.0-r1.ebuild 7885 BLAKE2B bc101a34ee46f11314a0c55810c7d5444db5d2d2c18fce9ba9c78e3d68356f49c017aece7578f3a714fcc758288a427e989a93f2bf7f3c336c2b4b3a9d0a843e SHA512 f62450c598a35fe55a544ae9255fadd8f0376e40fe7a21f9f5cb9df47c3ef30297e77da50679841c47f69338e68ba52bbb97e9f5705fe54d9b5dea7f15fb2e2e
-EBUILD openssl-3.1.0-r2.ebuild 8242 BLAKE2B 445ad673ee2d5ebbec8d190b9b11b22cf5dee880cd2faacc78b01bda36b0daba69dd2b66b605308b801bc3f3b254a5d8ad0b5c92075c69a3e4cb2de150d39e91 SHA512 a538c2533943a79199f7d76b70fa5581f519199a4798194695b0cd090acc495d7bb7ca56a14d20ca97598f5ad63df335520cc77213bf90410ce646015a10d075
-EBUILD openssl-3.1.0.ebuild 7836 BLAKE2B 98a3e069f68c4e67cc905021d0857f1d3ed487a71abae6705b38bea79285d78f298b5ce3e85cd4834d3d18158a7a47d9c44adb37c72bb5043a6228a66a9c01d1 SHA512 67d916b42bae7512cd2633fe473233fb7630089a26fcb203dff265a1afa7636f93e9fe5b152082f243bacec7833b12e0137c461ff07031700ac45916f828db1f
+EBUILD openssl-1.1.1t-r3.ebuild 8385 BLAKE2B 7635320b4cda62933e0fa19dfa3bc6e15e2cc3cae31baf9485eab7762584fad4d145cf1f1039538e6435767aad40e1a61bec1de67886bb0bf6dcdfbe935f3004 SHA512 3a4a1768b1b048095b460abed409b131ccecebcb0d02616b943f0661886d368a63b7f7cf57814f540fbd270f11fcf1169bae68ce6a68b952e42390dafbf478eb
+EBUILD openssl-3.0.8-r4.ebuild 8244 BLAKE2B 4765379bb4ae1295b4f89c2bfce5b72b9f6322400e0b76b7394286d544bdf3ce9162261455907e95deff15d36a835ca666a213a23996de8eccf054012593b9df SHA512 d67e71a6e828b210d70bf1d848167d6e73462e3965f47bb875908c1e95965eec5efcbbb880b791bfc7e2961ee970804210e7ac3deff6a408dece6583af1cf0d2
+EBUILD openssl-3.1.0-r3.ebuild 8291 BLAKE2B 6db8d1532f6615bff4a6d16ef8db0380d0d0e72f5d6adf62b8fc84bc424846b5a72f7cc23658c46ea9d81bb9d833195d1156e7b2154107ce23ff4493ee67b705 SHA512 c8bf2d0229fcd8463882c3463ea9939a795f4fdff56d9c92192cc4a09249366f1d017d41ba198bf24da9591af79896e67c9e05ddd63193b6b5abd7c05434f2a2
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-1255.patch b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-1255.patch
new file mode 100644
index 000000000000..9b1a657d51be
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.0.8-CVE-2023-1255.patch
@@ -0,0 +1,40 @@
+commit 02ac9c9420275868472f33b01def01218742b8bb
+Author: Tomas Mraz <tomas@openssl.org>
+Date:   Mon Apr 17 16:51:20 2023 +0200
+
+    aesv8-armx.pl: Avoid buffer overrread in AES-XTS decryption
+    
+    Original author: Nevine Ebeid (Amazon)
+    Fixes: CVE-2023-1255
+    
+    The buffer overread happens on decrypts of 4 mod 5 sizes.
+    Unless the memory just after the buffer is unmapped this is harmless.
+    
+    Reviewed-by: Paul Dale <pauli@openssl.org>
+    Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
+    (Merged from https://github.com/openssl/openssl/pull/20759)
+    
+    (cherry picked from commit 72dfe46550ee1f1bbfacd49f071419365bc23304)
+
+diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
+index 6a7bf05d1b..bd583e2c89 100755
+--- a/crypto/aes/asm/aesv8-armx.pl
++++ b/crypto/aes/asm/aesv8-armx.pl
+@@ -3353,7 +3353,7 @@ $code.=<<___	if ($flavour =~ /64/);
+ .align	4
+ .Lxts_dec_tail4x:
+ 	add	$inp,$inp,#16
+-	vld1.32	{$dat0},[$inp],#16
++	tst	$tailcnt,#0xf
+ 	veor	$tmp1,$dat1,$tmp0
+ 	vst1.8	{$tmp1},[$out],#16
+ 	veor	$tmp2,$dat2,$tmp2
+@@ -3362,6 +3362,8 @@ $code.=<<___	if ($flavour =~ /64/);
+ 	veor	$tmp4,$dat4,$tmp4
+ 	vst1.8	{$tmp3-$tmp4},[$out],#32
+ 
++	b.eq	.Lxts_dec_abort
++	vld1.32	{$dat0},[$inp],#16
+ 	b	.Lxts_done
+ .align	4
+ .Lxts_outer_dec_tail:
diff --git a/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-1255.patch b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-1255.patch
new file mode 100644
index 000000000000..aea425f83556
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.1.0-CVE-2023-1255.patch
@@ -0,0 +1,40 @@
+commit bc2f61ad70971869b242fc1cb445b98bad50074a
+Author: Tomas Mraz <tomas@openssl.org>
+Date:   Mon Apr 17 16:51:20 2023 +0200
+
+    aesv8-armx.pl: Avoid buffer overrread in AES-XTS decryption
+    
+    Original author: Nevine Ebeid (Amazon)
+    Fixes: CVE-2023-1255
+    
+    The buffer overread happens on decrypts of 4 mod 5 sizes.
+    Unless the memory just after the buffer is unmapped this is harmless.
+    
+    Reviewed-by: Paul Dale <pauli@openssl.org>
+    Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
+    (Merged from https://github.com/openssl/openssl/pull/20759)
+    
+    (cherry picked from commit 72dfe46550ee1f1bbfacd49f071419365bc23304)
+
+diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
+index ea74217317..efd3ccd1a4 100755
+--- a/crypto/aes/asm/aesv8-armx.pl
++++ b/crypto/aes/asm/aesv8-armx.pl
+@@ -3367,7 +3367,7 @@ $code.=<<___	if ($flavour =~ /64/);
+ .align	4
+ .Lxts_dec_tail4x:
+ 	add	$inp,$inp,#16
+-	vld1.32	{$dat0},[$inp],#16
++	tst	$tailcnt,#0xf
+ 	veor	$tmp1,$dat1,$tmp0
+ 	vst1.8	{$tmp1},[$out],#16
+ 	veor	$tmp2,$dat2,$tmp2
+@@ -3376,6 +3376,8 @@ $code.=<<___	if ($flavour =~ /64/);
+ 	veor	$tmp4,$dat4,$tmp4
+ 	vst1.8	{$tmp3-$tmp4},[$out],#32
+ 
++	b.eq	.Lxts_dec_abort
++	vld1.32	{$dat0},[$inp],#16
+ 	b	.Lxts_done
+ .align	4
+ .Lxts_outer_dec_tail:
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild
deleted file mode 100644
index ae35bd52b8b8..000000000000
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	# General patches which are suitable to always apply
-	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-
-	use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER"
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# - Make sure the man pages are suffixed (bug #302165)
-	# - Don't bother building man pages if they're disabled
-	# - Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${BROOT}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		${ec_nistp_64_gcc_128}
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl sslv3 ssl3)
-		$(use_ssl sslv3 ssl3-method)
-		$(use_ssl asm)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl tls-heartbeat heartbeats)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
-	dodir /usr
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*}
-		d=${d#./}
-		m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# Fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m}
-
-		# Locate any symlinks that point to this man page
-		# We assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-
-			rm -f ${d}/${s}
-
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1t-r2.ebuild b/dev-libs/openssl/openssl-1.1.1t-r2.ebuild
deleted file mode 100644
index ed79949dc698..000000000000
--- a/dev-libs/openssl/openssl-1.1.1t-r2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-
-MY_P=${P/_/-}
-DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt"
-fi
-IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		kernel_linux? ( sys-process/procps )
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-PDEPEND="app-misc/ca-certificates"
-
-# force upgrade to prevent broken login, bug #696950
-RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-PATCHES=(
-	# General patches which are suitable to always apply
-	# If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch # bug #671602
-	"${FILESDIR}"/${PN}-1.1.1i-riscv32.patch
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-	"${FILESDIR}"/openssl-1.1.1t-CVE-2023-0464.patch
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES}; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	if use prefix && [[ ${CHOST} == *-solaris* ]] ; then
-		# use GNU ld full option, not to confuse it on Solaris
-		sed -i \
-			-e 's/-Wl,-M,/-Wl,--version-script=/' \
-			-e 's/-Wl,-h,/-Wl,--soname=/' \
-			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-}
-
-src_configure() {
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#	ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config=( perl "${S}/Configure" )
-	[[ -z ${sslout} ]] && config=( sh "${S}/config" -v )
-
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		${ec_nistp_64_gcc_128}
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl sslv3 ssl3)
-		$(use_ssl sslv3 ssl3-method)
-		$(use_ssl asm)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl tls-heartbeat heartbeats)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	edo "${config[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
-
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl install_docs
-	fi
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
-	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
index a25fd43760eb..321c29feb04c 100644
--- a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl/openssl-3.0.8-r1.ebuild b/dev-libs/openssl/openssl-3.0.8-r1.ebuild
deleted file mode 100644
index ea11e22eb155..000000000000
--- a/dev-libs/openssl/openssl-3.0.8-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-}
-
-src_configure() {
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use fips && echo "enable-fips")
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	edo perl "${S}/Configure" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake build_sw
-
-	if multilib_is_native_abi; then
-		emake build_docs
-	fi
-}
-
-multilib_src_test() {
-	# VFP = show subtests verbosely and show failed tests verbosely
-	# Normal V=1 would show everything verbosely but this slows things down.
-	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
-	if use fips; then
-		emake DESTDIR="${D}" install_fips
-		# Regen this in pkg_preinst, bug 900625
-		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
-	fi
-
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
-	fi
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	if use fips; then
-		# Regen fipsmodule.cnf, bug 900625
-		ebegin "Running openssl fipsinstall"
-		"${ED}/usr/bin/openssl" fipsinstall -quiet \
-			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
-			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
-	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-3.0.8-r2.ebuild b/dev-libs/openssl/openssl-3.0.8-r2.ebuild
deleted file mode 100644
index bc44de5a3345..000000000000
--- a/dev-libs/openssl/openssl-3.0.8-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0464.patch
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-}
-
-src_configure() {
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use fips && echo "enable-fips")
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	edo perl "${S}/Configure" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake build_sw
-
-	if multilib_is_native_abi; then
-		emake build_docs
-	fi
-}
-
-multilib_src_test() {
-	# VFP = show subtests verbosely and show failed tests verbosely
-	# Normal V=1 would show everything verbosely but this slows things down.
-	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
-	if use fips; then
-		emake DESTDIR="${D}" install_fips
-		# Regen this in pkg_preinst, bug 900625
-		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
-	fi
-
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
-	fi
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	if use fips; then
-		# Regen fipsmodule.cnf, bug 900625
-		ebegin "Running openssl fipsinstall"
-		"${ED}/usr/bin/openssl" fipsinstall -quiet \
-			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
-			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
-	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-3.0.8-r3.ebuild b/dev-libs/openssl/openssl-3.0.8-r4.ebuild
similarity index 99%
rename from dev-libs/openssl/openssl-3.0.8-r3.ebuild
rename to dev-libs/openssl/openssl-3.0.8-r4.ebuild
index 47c1bd2d6e83..e11cbae84179 100644
--- a/dev-libs/openssl/openssl-3.0.8-r3.ebuild
+++ b/dev-libs/openssl/openssl-3.0.8-r4.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0464.patch
 	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0465.patch
 	"${FILESDIR}"/openssl-3.0.8-CVE-2023-0466.patch
+	"${FILESDIR}"/openssl-3.0.8-CVE-2023-1255.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/openssl/openssl-3.1.0-r1.ebuild b/dev-libs/openssl/openssl-3.1.0-r1.ebuild
deleted file mode 100644
index f50b53ac125a..000000000000
--- a/dev-libs/openssl/openssl-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="
-		mirror://openssl/source/${MY_P}.tar.gz
-		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
-	"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	!<net-misc/openssh-9.2_p1-r3
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0464.patch
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-}
-
-src_configure() {
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use fips && echo "enable-fips")
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	edo perl "${S}/Configure" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake build_sw
-
-	if multilib_is_native_abi; then
-		emake build_docs
-	fi
-}
-
-multilib_src_test() {
-	# VFP = show subtests verbosely and show failed tests verbosely
-	# Normal V=1 would show everything verbosely but this slows things down.
-	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
-	if use fips; then
-		emake DESTDIR="${D}" install_fips
-		# Regen this in pkg_preinst, bug 900625
-		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
-	fi
-
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
-	fi
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	if use fips; then
-		# Regen fipsmodule.cnf, bug 900625
-		ebegin "Running openssl fipsinstall"
-		"${ED}/usr/bin/openssl" fipsinstall -quiet \
-			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
-			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
-	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-3.1.0-r2.ebuild b/dev-libs/openssl/openssl-3.1.0-r3.ebuild
similarity index 99%
rename from dev-libs/openssl/openssl-3.1.0-r2.ebuild
rename to dev-libs/openssl/openssl-3.1.0-r3.ebuild
index 82fbb55ebda8..e98ee05437c1 100644
--- a/dev-libs/openssl/openssl-3.1.0-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.1.0-r3.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0464.patch
 	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0465.patch
 	"${FILESDIR}"/openssl-3.1.0-CVE-2023-0466.patch
+	"${FILESDIR}"/openssl-3.1.0-CVE-2023-1255.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/openssl/openssl-3.1.0.ebuild b/dev-libs/openssl/openssl-3.1.0.ebuild
deleted file mode 100644
index d13af77736ea..000000000000
--- a/dev-libs/openssl/openssl-3.1.0.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-MY_P=${P/_/-}
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="
-		mirror://openssl/source/${MY_P}.tar.gz
-		verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
-	"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	!<net-misc/openssh-9.2_p1-r3
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
-
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openssl-3.0.8-mips-cflags.patch
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl doesn't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Can delete this once test fix patch is dropped
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		PATCHES+=(
-			# Add patches which are Gentoo-specific customisations here
-		)
-	fi
-
-	default
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-}
-
-src_configure() {
-	# Keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (bug #417795 again)
-	tc-is-clang && append-flags -Qunused-arguments
-
-	# We really, really need to build OpenSSL w/ strict aliasing disabled.
-	# It's filled with violations and it *will* result in miscompiled
-	# code. This has been in the ebuild for > 10 years but even in 2022,
-	# it's still relevant:
-	# - https://github.com/llvm/llvm-project/issues/55255
-	# - https://github.com/openssl/openssl/issues/18225
-	# - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
-	# Don't remove the no strict aliasing bits below!
-	filter-flags -fstrict-aliasing
-	append-flags -fno-strict-aliasing
-
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# bug #197996
-	unset APPS
-	# bug #312551
-	unset SCRIPTS
-	# bug #311473
-	unset CROSS_COMPILE
-
-	tc-export AR CC CXX RANLIB RC
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths, bug #460790.
-	#local ec_nistp_64_gcc_128
-	#
-	# Disable it for now though (bug #469976)
-	# Do NOT re-enable without substantial discussion first!
-	#
-	#echo "__uint128_t i;" > "${T}"/128.c
-	#if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#       ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#fi
-
-	local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
-	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
-	local myeconfargs=(
-		${sslout}
-
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use fips && echo "enable-fips")
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use test || echo "no-tests")
-		$(use_ssl tls-compression zlib)
-		$(use_ssl weak-ssl-ciphers)
-
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-
-		shared
-		threads
-	)
-
-	edo perl "${S}/Configure" "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake build_sw
-
-	if multilib_is_native_abi; then
-		emake build_docs
-	fi
-}
-
-multilib_src_test() {
-	# VFP = show subtests verbosely and show failed tests verbosely
-	# Normal V=1 would show everything verbosely but this slows things down.
-	emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install_sw
-	if use fips; then
-		emake DESTDIR="${D}" install_fips
-		# Regen this in pkg_preinst, bug 900625
-		rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
-	fi
-
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install_ssldirs
-		emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
-	fi
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs. But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# Create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# bug #254521
-	dodir /etc/sandbox.d
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
-	if use fips; then
-		# Regen fipsmodule.cnf, bug 900625
-		ebegin "Running openssl fipsinstall"
-		"${ED}/usr/bin/openssl" fipsinstall -quiet \
-			-out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
-			-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
-		eend $?
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
-	openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
-	eend $?
-}
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index d93758b2d8cc..40f6be1e2ee4 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,3 +1,4 @@
-DIST sdformat-9.8.0.tar.bz2 706107 BLAKE2B d4880b8b26bc792f7932f92238fea9e583284fb95fd139da2755590f795bf8f00d2087b949ff44df7c04f7e3e81218f7a7f5643c65164e7805b76626ac13de4b SHA512 090e654f442c26d0a930960fa603ab5e58a28d8cef276ea75f4f63cad29c249c90045e76a2e081b2f90bc569b80abee086efe7598c138fd81b387535debf7e6c
-EBUILD sdformat-9.8.0.ebuild 808 BLAKE2B 00efeb0f8266d762d3d509d5d3b2257117dc7757e788218e30f8096fdcce3ff57da627e90e75b09d8f2bb41f51d236b147083cdf5149ff708e4680ab441a992a SHA512 fcbc2147f6b49eb76016029d7fff1ad1a6c77f16d31cd5592b46c18e143ff518027ac257dd8a3a7ec0813a32c137a438b6f5020d1a7d44680b0418fa1ced0330
+AUX ruby.patch 775 BLAKE2B 48ffc270e77fcb4cd6d41c31007fa36761d662f238d3789b143a92a24a1d516b17d66b13af9c86f3c667c356f2f61438545a42fe719a5b5b72049c9555c3156d SHA512 7a8f5b6caec50dc2833de6efd84b67daa5feea1607390935fddaee83565ee51e1081a832479bd706bbebbfa7e6a8945cd24f1ddb01c0b8d30ed94f6d77b81bc1
+DIST sdformat-9.10.0.tar.bz2 709883 BLAKE2B 3f79ad7d13cc3e2b4e4ee7b2dfc5819e805ccbae7678e4ea4d4e2577845ddc3bc69c15043132de989ac286642757bcf0c1d66990fddbc3b61aa1a297c78b7682 SHA512 233305adc98a57eef360200d651bf0951229b12383e49496e05989ce165d88d4fd86c40819a6b6528125fe0185157d26b5712880332971d8bd2fd1f7daa4c6e8
+EBUILD sdformat-9.10.0.ebuild 845 BLAKE2B 740dd09c8be02e1e0df9bc2766490fd8de4682aadb4e157825474bc7727af94e689e339d8395126b5e3557fbe428b3071dfbd4a852b299096b1d9b59fba7cda6 SHA512 7b144b19dd7e695694d46c5e72a5621ab529e97a11c3bb26afac04e7cf0193230730385db482da6daa032a14601e3cdfb1e141112148b88229cc2ddfcc9cae53
 MISC metadata.xml 244 BLAKE2B 5a5426f4a80c61e49915e23ab7298bd1e53d89bd5361ad61fdaa3a50c88e7f27ea69205fd8c407addfdfde991e10cbe70aa554bfd737daf9d3d639c4eddd5934 SHA512 052b13f84da2d92069cdab006492e4b72274519bae5081f01ee4605215c7dca16bade6fa3856a7fec9435d1b564e607c9c52e0f9fdf199363af330778bf6c0af
diff --git a/dev-libs/sdformat/files/ruby.patch b/dev-libs/sdformat/files/ruby.patch
new file mode 100644
index 000000000000..ceada099cfe3
--- /dev/null
+++ b/dev-libs/sdformat/files/ruby.patch
@@ -0,0 +1,31 @@
+Index: sdformat-9.10.0/tools/xmlschema.rb
+===================================================================
+--- sdformat-9.10.0.orig/tools/xmlschema.rb
++++ sdformat-9.10.0/tools/xmlschema.rb
+@@ -265,7 +265,7 @@ opt_parser.parse!
+ if infile.nil?
+   puts "Missing option -i."
+   exit
+-elsif !File.exists?(infile)
++elsif !File.exist?(infile)
+   puts "Input file[#{infile}] does not exist\n"
+   exit
+ end
+@@ -273,7 +273,7 @@ end
+ if $path.nil?
+   puts "Missing option -s."
+   exit
+-elsif !Dir.exists?($path)
++elsif !Dir.exist?($path)
+   puts "SDF source dir[#{$path}] does not exist\n"
+   exit
+ end
+@@ -281,7 +281,7 @@ end
+ if outdir.nil?
+   puts "Missing output directory, option -o."
+   exit
+-elsif !Dir.exists?(outdir)
++elsif !Dir.exist?(outdir)
+   Dir.mkdir(outdir)
+ end
+ 
diff --git a/dev-libs/sdformat/sdformat-9.8.0.ebuild b/dev-libs/sdformat/sdformat-9.10.0.ebuild
similarity index 91%
rename from dev-libs/sdformat/sdformat-9.8.0.ebuild
rename to dev-libs/sdformat/sdformat-9.10.0.ebuild
index 4a78444096c6..210757ba03de 100644
--- a/dev-libs/sdformat/sdformat-9.8.0.ebuild
+++ b/dev-libs/sdformat/sdformat-9.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ BDEPEND="
 	dev-lang/ruby:*
 	virtual/pkgconfig
 "
+PATCHES=( "${FILESDIR}/ruby.patch" )
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 528fe5d22d27..e91e6cfd8acc 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,9 @@
 DIST vala-0.56.4.tar.xz 3978480 BLAKE2B 22cde236f3d397499f6bf41c038422bf17bb5878096eb27c4a1efec9ea296623e52099250852b0085ca691243ec3cda6316598b20e3700816e2bf29032e625a4 SHA512 302e72a42fcb0cffc1c8eec28014f216c3848aaecec100acabc5e952d6f3ad2471b341e92a266f452c3335b8d1dde9cb0b1e6da62b754ffb4749b0aa862f24ba
 DIST vala-0.56.5.tar.xz 3987316 BLAKE2B 3f8678f894f526da310dd65b2a0e9ebc9e7aff6cc89538dbbbc4d2798ead7bdaa27ccb33834645494fad869e17e2f32174626ca6d190c661a2df2a498bfafdae SHA512 58bb5ea45f519414ffe0dad2f23dcf689eac2d8cd310a627d0c3667f38ec4ccd5ec1ca5921f8ec177db3004f24c7c5a138bd4652c7a07a78f0ce046e32ad9b6a
 DIST vala-0.56.6.tar.xz 3989404 BLAKE2B eae35fb685f546cee902a84a9a0ea15fa1c3596a94c1def93746512e32e22b65ad80f788a7899c5f69f5447906880318ba2b78dc582a9fdb7cf70cde88404aa3 SHA512 ea9c25b96f52ed1067c2a8787b15c44a088e19907880ee6b32bb0e3b544a078bd342e3aef9afefb8daec6f6b4fce25a9290a278dcfc293308327153543acb9bc
+DIST vala-0.56.7.tar.xz 3992100 BLAKE2B 09804dba1dcaaef2af2621f7ee6c5c69d0bb06c1f83162df4379f438c9a8eab94e9496b1be1dc9ca25e796caadf38342921884e3460c00d3693617b94a61b013 SHA512 f524ac7acee988aae895a9c850904b5a6b5462ad3b498fa4305cea9b97e3e966b0ace341ce0ba9ba2466e6d22a1fcd4c657600c5d838d80cc0ac75be8e6d3185
 EBUILD vala-common-0.56.4.ebuild 688 BLAKE2B 43035d0285a4fc8cc360969b0cea254660cc6d1645499258c1ff9171797a522a0d8f3ae4736a3c33ed39c3788a5bdd750b6063958b60cc21b21a20823b55f27b SHA512 b030fde9c0945ac51e18acae0504fe7d7c2188a1972ac72c30227e38956f5abc106b07cc1dff66a1cd02d819d40426dfcd3e11bd42656c01a687519eec6dfb9b
 EBUILD vala-common-0.56.5.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d
 EBUILD vala-common-0.56.6.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d
+EBUILD vala-common-0.56.7.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d
 MISC metadata.xml 401 BLAKE2B 4fdcf38a56aa788f69584bac474de0c8e7130cb2b0a296c987e103bd0d9b879916c488fef9cf4cf40651c739bc168b5977395d7489402005dd0cf0fb45b3e431 SHA512 1944bbcc38712dc31ab26f4bfe52d848cd16fd844be3f2533b87dc13f26d5040e1118e8e928891f3e9bac844abe1b8264788bbdb548513ac7d2c3c393591067b
diff --git a/dev-libs/vala-common/vala-common-0.56.7.ebuild b/dev-libs/vala-common/vala-common-0.56.7.ebuild
new file mode 100644
index 000000000000..cd0ecf1d538a
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.56.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 1defe8437758..5b9016978546 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7
 DIST xapian-bindings-1.4.22.tar.xz 1074840 BLAKE2B 49c71ece1a159a21b95ff8b6d30c5786e6fd2d1744f0a2e27427b83a85ebced6106ab57655715f6e2089bc3e56da32d6f2ad3d71303a1b75316c7d1a61f84cd0 SHA512 0d1b615646d1bdf383e4e32ae152c1493a23ad173232929c8153bb311b3f5b6c6728f29f46f703854c9249ffb35cb620eda1d68cf742c2150f628c19ed55c10f
 EBUILD xapian-bindings-1.4.19.ebuild 7115 BLAKE2B 9c93d9f8b020813a6b997a957b10592c3d7564e9ad01410d72beb676d8d48237c7419bdbd44ccccac3581b5b885933ab1b5a2282aadd75bbe83a86892e6cdc79 SHA512 68370978c0ba23e83304613663d387a6cf2ef4b6c6677975702382c76539b069f4c52772e13fbde9aed442fca432ce94b108eb715ee769e46a4036d8e74a322b
 EBUILD xapian-bindings-1.4.21.ebuild 7119 BLAKE2B 28da79127ce839b22daea81505f3d7523209238be7747d4fac27cbedd676fb332f758dc1ccde95eb5fc72217e9d0e97556518f8b743905e7aa19e8c32a6a0cab SHA512 0ab987f1757ccae25087b9b44d62ae8c37cff59f350ee72bc03186ca58a4fea8f91313c3a531b90556e0d622f74fae06f4a36005bc7887d2e0a1ea609204c8ed
-EBUILD xapian-bindings-1.4.22.ebuild 6989 BLAKE2B 57145549b2f0f99f1f4849e7ea733d74ff2c124bcacad51d0a6abceabe88a7465522279f6fdf9a12e16231f3b78b7bbba290e74e210f3670c9e722f1623dc683 SHA512 a4565ba0ba4c42e1f2f04ec8f7721b925de0d63b1dc3d6977b290e4354fd1c47de70d2f7a1836e8213f8054c24a25ce846d93262ad022500f70fb0bb93303057
+EBUILD xapian-bindings-1.4.22.ebuild 6987 BLAKE2B bf0907f498759f06ac6a03d37ff884e4e280cb4d003f35c9d59ff97f5ca8c5a8fc2efe42aa631ca1bb4c007126ea9e85b5f85ec41cc2ca29dc6ad35af52800dd SHA512 45eb92f381017121f6a99e1ca58b59d23884e4a45b88d48a1ed2eeafbc23e266edf7bc843d444bb443988f80e463c09d24972c695b15b4aa1937a26e72e12e51
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
index 2503dbf242df..1c2bf28fe943 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P}"	# need this here, some inherited eclasses change it
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="
 	|| ( java lua mono perl php python ruby tcl )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a0add3b5b01b..fe3195f92146 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,5 +4,5 @@ DIST xapian-core-1.4.22.tar.xz 3019608 BLAKE2B f4aec86cd5f63f6f1825a4f8f427ea23b
 EBUILD xapian-1.4.19.ebuild 1881 BLAKE2B c35cd8b3aeccab24d62187fb405ed78a83d073ccfcda27caccc29461a2f1f16f7122ad462c796c9ca3527d26f2f7d72805be83dc1cc8a40c49ea5ef574e6cf33 SHA512 58770b49391f37da0322b208d6fdc21478138deb978aa7032625b82a34c43613aec973666466e7175ad0e8e739c573767600d0ca2aa4c0b882cad70386d2644d
 EBUILD xapian-1.4.21-r1.ebuild 1431 BLAKE2B 18eb02c6338b248bc4d6c3cf0a5cdafcbcf711a3c1167396506e3593f0b03c1094bf7811e3c89c2be57fff9b94d02659b621dff89822a891642366897808f396 SHA512 9efb6374e9e3ba334c768706dfebedecebfaba3c7f46327b40d336205d4894d2d2a9c5b9457359133279411e3745f55ca692755445310f6bacc26ccf7efc09a5
 EBUILD xapian-1.4.21.ebuild 1881 BLAKE2B c54cf9d37454b61dc8c8c3716439461d76884651cd68746404d6697c148895848cf01b86b864508687b7be9f689a3d4af0204f44704de073184d9168b0888b15 SHA512 a60e6628a3dfdd1a92a638f88716b8822b3b1bc66cdcb588ce86da516ced52f78640343af4333f55b90b8781a52a61393b64fc547e85e76633020f288ede7975
-EBUILD xapian-1.4.22.ebuild 1405 BLAKE2B 09494d14f4d2655ac5c159ec16c5e5bd3b4bb1e044037f434c1205e511108b4159eb22a77b0624a7145dceceab89225f70a73577089f98609c426c252db0e25c SHA512 d39ede4bc59862166324c994c01af32a17731619b85ca4da832c40b1262fb1c971c321702015e9b4b08f16dc4446856bd3e20b1392a3814a2883a1ba0f6c0904
+EBUILD xapian-1.4.22.ebuild 1402 BLAKE2B 47d4d55f734075e31cd768086d811cc6199e9e52965bd8cab7f2668f1e4a6b5a87024c0c545b91480cbfcbe96e7aab26893727e1c91dc63bf0f35f983f9a1a19 SHA512 d9f02878bd719b8c64797d549362798d236a814d0261a4731e86569bf8f9888291a6357d3ad17df579f6d7904bf851f3e5f5e316d292ea42dbc8192c57632363
 MISC metadata.xml 728 BLAKE2B 7873e39dfb724c6f3268a7de74226d86dea77e6dd53b21aa0df104db1d30efa5c24c18b8e6597acc45b4b6bb39f1f069b7944ef0ebc2906e75a2b5efeed02ebc SHA512 5f582793cee9b74f5b36f57d6997120cf61c4f4204c49694d07b9ace813a9821710a812df2db315e9effa4913fa3b62ab069be96399369f46cc7c811b6d728ba
diff --git a/dev-libs/xapian/xapian-1.4.22.ebuild b/dev-libs/xapian/xapian-1.4.22.ebuild
index 40a621af6000..c4fdfd3e38ad 100644
--- a/dev-libs/xapian/xapian-1.4.22.ebuild
+++ b/dev-libs/xapian/xapian-1.4.22.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index c11c990b703d..60d0dfe47838 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -1,5 +1,8 @@
 AUX xmlrpc-c-1.51.06-pkg-config-libxml2.patch 7240 BLAKE2B 472b313f8b815c1235cc72b56e9081d855277de21e066a1f2db5acb650d4fc4daedca2e82c05116b353b340c1359bfd8e480b19bd1cc5f4f36627f7ccf66760a SHA512 478af29becba5ee415f0b92f15af1cd8273daf14bc4b5fee4deca83197f11a975a40c94c9400050eac5030eb840d55a54282aaed403f105ab0752b1eec398c08
 AUX xmlrpc-c-1.51.06-pkg-config-openssl.patch 1244 BLAKE2B be5e48daa409cb67ae5f75fec54c25ee160e476ef03e5814917f81c887622e8acb5456af29e976ffec761ce4e16c3d5c5b14b75151c594afdc6e8dd48b4dd596 SHA512 73b983c6e0fa97ba0dbceb8bbc7699a51f4e625c05cdfc5a27bf973bf039e9224eb1ec7f21e94ae70d8e32b4f9a1b1dbb04959f639e558b32270a467a72a87e3
+AUX xmlrpc-c-1.54.06-wformat-security.patch 1107 BLAKE2B 4572a031c01f018af7fe8281429d8a43c93a07f9af0cae47d1f5c2e1b4cf0aac98c0a3d00bce7ff4964b61d9f1c4b2a265379f5efcf49ccb60c4207bcccafd34 SHA512 5ecaea4f875261b9c108840779554505fead02011b5fbf6387a01335cbcd5169e2f76b491806efabdb418c0dee9977f15856470099e3464ec039bf8dada9b9ec
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
+DIST xmlrpc-c-1.54.06.tgz 933199 BLAKE2B 1286323b59aa4d77fe2f8b04fef18d9a448d29a7fa23aad143418e62c92ac6a5156bb61ee58e0df4b0667e73a9170663b02b42fac94b38df71fc789d13e929e0 SHA512 0e8c920ccf04c78947bc66f7210b62c153ba185183c181461584772885690a3bb09dcf63d69c5b0f1f76a96f162a2a0eba6268e7210dda42561f59bec8008733
 EBUILD xmlrpc-c-1.54.05-r2.ebuild 2013 BLAKE2B e227ee8ac8f9ed851004c5f59bd19de358a2a39a9a822c23c5f567633d9e58665aeed8b9f8084952fb38aa8b014bc236a1b6ef55aff68be3846aabfc0b8e1a76 SHA512 9a8015aa57bc48d12bfd542bcc5e48945167ce6f23e77326960135be6a0a42058ab3c6c82ceb15668de606e42f908cbecf9562d3aa0436dc0dc35bc162bc305d
+EBUILD xmlrpc-c-1.54.06.ebuild 2091 BLAKE2B b1af861e1bd328941d8614f8961e7a95680244b15c265ac9896c23263656042f78c3c2b5a15be1c738991a455f82a51736398b2c370b4800ac1778c97eefad48 SHA512 d1b27e5efbbee75b6594202463fab36fb13c43c56d204a9a6cad2e0758c7a405e29c1b17288a565f9418e407b8864c88efc4859892e4343d7f45b81b5f2384c4
 MISC metadata.xml 628 BLAKE2B 3d59eebbcf6eddfba969215a990fd59daa58b78dc305f05d10ba9f77f3ce5d5edbed0599644b40574beacb3c1e084af745bc2d75f0cb660968f4e3bf963c4f00 SHA512 fd572b06cc3359372e5b048d721b33d6bb614ab631fec95628af36217f94434fc9f279d83ec0de8828cd72265158b1a88f58418f94fb2e3d3e82de117c7bea71
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
new file mode 100644
index 000000000000..462adcd06375
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.54.06-wformat-security.patch
@@ -0,0 +1,29 @@
+https://src.fedoraproject.org/rpms/xmlrpc-c/raw/rawhide/f/0001-xmlrpc_server_abyss-use-va_args-properly.patch
+
+From d31c2ffbf5181053330fa32e4f03c47283bd1448 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sat, 17 Dec 2016 10:28:31 +0100
+Subject: [PATCH 1/3] xmlrpc_server_abyss: use va_args properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../src/xmlrpc_server_abyss.c: In function ‘createServer’:
+../src/xmlrpc_server_abyss.c:783:13: error: format not a string literal and no format arguments [-Werror=format-security]
+             xmlrpc_faultf(envP, error);
+             ^~~~~~~~~~~~~
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+--- a/src/xmlrpc_server_abyss.c
++++ b/src/xmlrpc_server_abyss.c
+@@ -780,7 +780,7 @@ createServer(xmlrpc_env *                      const envP,
+         ServerInit2(abyssServerP, &error);
+ 
+         if (error) {
+-            xmlrpc_faultf(envP, error);
++            xmlrpc_faultf(envP, "%s", error);
+             xmlrpc_strfree(error);
+         }
+     }
+-- 
+2.13.1
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
new file mode 100644
index 000000000000..a9115dea33cf
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweight RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.54"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
+	"${FILESDIR}"/${PN}-1.54.06-wformat-security.patch
+)
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+}
+
+src_configure() {
+	tc-export PKG_CONFIG
+
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+src_compile() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake -rC "${S}"/tools
+}
+
+src_install() {
+	default
+
+	# Tools building is broken in this release
+	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index a8db9e5b1144..3f7d01c7658f 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 72333d57ed28..5ab57963b0b6 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,6 +1,3 @@
-AUX lualdap-1.3.0-lua5-4.patch 552 BLAKE2B d685838d05b9c2e4354abf436837940725f80fd8d81d806a383c0975bfb67ff8b679bd668bfbc524129a4e62cb0f4b5f77e070b1afeec85809a6533114fb1442 SHA512 fb1f7eea88afae2e854f0cabf115739ab4900247483f9d1d8f15f0c5dcaa85ee2c6e16414bce300450b1531a5c76516f8260000c54707d85547236a7185d65e8
-DIST lualdap-1.3.0.tar.gz 81987 BLAKE2B cd25cada91a3c330fb72ee1106298442c64b1bcae4a57f48937efb4311f70b53c5a0e96587caab4b1950b16d9957bb8c25b2b9e0d3753089f06fbae64180ff04 SHA512 dea4282928c5138a327cd97d3d8049341fac17b5e853440f5b0a6e115e3400bac908f24827d48e36bfe81720c7d2bacdc50ae189953ecbcdfb27cb23b78d0de8
 DIST lualdap-1.3.1.tar.gz 82290 BLAKE2B 8436f1b3cf6497a3aea19de74a2e06bf2bb9ba4951d7357584c5b29a4d37ea2c5d4877d6ea3d44fca42d19207366abdf6a017ce1953d283a7bc243d230081077 SHA512 29d622ecf63214ac26ade71478c383e4f1b7468097bf19b99b8209b3f6cbb2078298a149d64ba8a7ca4abe97aa45550982792fa4ac0a8014f7daf709fe725e9f
-EBUILD lualdap-1.3.0-r2.ebuild 1584 BLAKE2B 3221fd2bec9b524c8aca6c22961de9b4b60a413288f273f9d7085f3de8bffa5d90ee541aecec6aa7fc0d7b1f3214ef988ddca581cf0761b4722255d43cf7bdbd SHA512 02d811158ae71460337a11b6351ad3d383d61fc924ea90d08c3077de2a7df2c064743546f47ee8290a59d79b3b5076fcc54e0d6fb9c7fb2c1d254717667e875c
-EBUILD lualdap-1.3.1.ebuild 1535 BLAKE2B 722c563eeb0eab0d454071c51ee330e96f6b2230db07843c3b471619eb28e3c07145a18f7c4a6996bae5ed1d2989a62a40006ba1635c1986f947434cbc3e7248 SHA512 0f25161c676386ceb8382b0ec9947fd043e2ee962c88709c544b68d30dd3433d74d9a882ad1fd150832246e4eb7348a55d11a2611695dd825fa5ee13631ec648
+EBUILD lualdap-1.3.1.ebuild 1533 BLAKE2B 38b59ec2bb0f3127eb70a6381cfecf1e8506ef59b33489c1fc23159fc3eee1bd4a2e3d7f2a2c8b73092249ab25e62c0aa05d4e9b927b57cd709b2745e2e94827 SHA512 b73b28c2ec74b9372105e4cceb0b3382c7a43b3bdd9090826269aaf57a9af6d4b13c922d27fc0b31a78338666e8bedb17ac4fea3508ac00a81d1131462150dba
 MISC metadata.xml 442 BLAKE2B 7e232b04c35cca3befb630d268e162bc7bb095f9802d6aa01b15a78f0ac276d8de41cb02e1f6a94f16f79d7afcbd99bce981ff3f6e04459b71a846378e4d2911 SHA512 c94b931cf34eabb0efc127029419aafa87491a3453ccf3f0045e19b8d23893b9192bbdc22eaf654d2250955f0dd90a217b7118e89664b2572258044ad40e265e
diff --git a/dev-lua/lualdap/files/lualdap-1.3.0-lua5-4.patch b/dev-lua/lualdap/files/lualdap-1.3.0-lua5-4.patch
deleted file mode 100644
index 9e85d9ff87c7..000000000000
--- a/dev-lua/lualdap/files/lualdap-1.3.0-lua5-4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d5fa475189d708f6e43d2aabac66424a6724bb39 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sat, 19 Mar 2022 19:20:48 +0100
-Subject: [PATCH] src/lualdap.c: fix lua5-4 support
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- src/lualdap.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/lualdap.c b/src/lualdap.c
-index 2ad0e6d..1ced88b 100644
---- a/src/lualdap.c
-+++ b/src/lualdap.c
-@@ -3,6 +3,8 @@
- ** See Copyright Notice in license.md
- */
- 
-+#define _GNU_SOURCE
-+
- #include <string.h>
- 
- #ifdef WIN32
diff --git a/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild b/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
deleted file mode 100644
index 4fe217830099..000000000000
--- a/dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="A lua binding for the OpenLDAP client libraries"
-HOMEPAGE="https://github.com/lualdap/lualdap"
-SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86"
-IUSE="test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	net-nds/openldap:=
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${RDEPEND} )
-"
-
-HTML_DOCS=( "docs/." )
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-lua5-4.patch" )
-
-src_prepare() {
-	default
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LBER_LIBDIR=/usr/$(get_libdir)"
-		"LDAP_LIBDIR=/usr/$(get_libdir)"
-		"LUA_INCDIR=$(lua_get_include_dir)"
-		"LUA_LIBDIR=/usr/$(get_libdir)"
-	)
-
-	emake "${myemakeargs[@]}"
-
-	popd || die
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua || die
-	popd || die
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	# Workaround, as 'make install' does not create this directory
-	dodir "$(lua_get_cmod_dir)"
-
-	local myemakeargs=(
-		"DESTDIR=${ED}"
-		"INST_LIBDIR=$(lua_get_cmod_dir)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	popd || die
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/lualdap/lualdap-1.3.1.ebuild b/dev-lua/lualdap/lualdap-1.3.1.ebuild
index bc819abad462..36fc9c5c764e 100644
--- a/dev-lua/lualdap/lualdap-1.3.1.ebuild
+++ b/dev-lua/lualdap/lualdap-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-lua/luasec/Manifest b/dev-lua/luasec/Manifest
index 150e71a4ab6a..0306c7e1c856 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,5 +1,5 @@
 DIST luasec-1.2.0.tar.gz 53379 BLAKE2B dad93b341565b602fa02a5551a127bce42e76cee5abb0314f9cc4a98f162d23b0f8b4b9c0f16423095e4b54ec5ab260ee06bef5993ad46f559ad1295dcc28856 SHA512 5564f73495bef7c5683285ff7648c7b82a3a3dfdce96e88c77cc8835427b6595a694e5a2bf0a4f6332fe52b8aed3d94531607df81260d7597458a6fb0465d3fe
 DIST luasec-1.3.1.tar.gz 54807 BLAKE2B e09d340b8bc391830d671dd5cbec76bd5190bebdd2e534800bea8efd19749a4379e2681bb7a6e6551da49109345f0b846904c222c0ecada6135d775e2060bfc7 SHA512 cfa4187518445abc6591bd0c24924122b62252be25ffd5564cf291f9a2ae3702a5fa299ffd265d2e0e8315b90d6783eccace4ff560f54f299161d3c5e3749508
 EBUILD luasec-1.2.0.ebuild 1737 BLAKE2B 633fd25ccf721edb600c479956f37504d46bca254e6df6f512325fbfa6c1964d07fe16256df50cb950358321993686de87bfa1d732a4550dc8c7718de1cc2202 SHA512 41d17718b574d404deb383f45b98de42271ab443b3e7f9069363008c1188ab17e720a6d52d7428a4ea69288f524880110f768ccfb0e1f37c03977be1241b9159
-EBUILD luasec-1.3.1.ebuild 1743 BLAKE2B 64fef07c045159eb73f3cb7c39147f7f89fba5ab013af0969180d3435fa1f297daf5c6821d8a20e91121708a55ee88b70617cd69c836d1bc2988413b150d54c3 SHA512 d9b987fa9f13ab9ff264817ee112f0ee3ab6ae6b97d99b8eb3a53fcb088dade71b2a217d4c2cd3c88f5d08b4cfbe213cf25b67533a10892fd98c6b6d39b528e6
+EBUILD luasec-1.3.1.ebuild 1737 BLAKE2B 7b985f8fe90ac76a529950deca77cb7968ac8d44455eafc335371e8c0ffcd9c609eef0f4ce6970a64bf1684de88116a25d438cc2df1fc0e9638f91c91b3e948a SHA512 0c6a3ce9626d6740d402d6cb9cc37873568a1cca4acde0d97174fdc7e2f12dde9ab03a8cb883f96bdcb22c8bc444e255b86084b589e70745da1ed22c0abe6a3f
 MISC metadata.xml 597 BLAKE2B 6398ca37e0d10458a7b1a111d2d0e8d44aa64136ada116a8bb73bf200be4c10f673c8f574733043eb7b2216c28b003c30a993736145344ae72ef25f001a5783e SHA512 399501a7a9c0b08d8747b30478a3810dde63efb48d2d42eeff1ba7355c882e35fd3528424930f618d51182f80641c1c6fb4662b31ec21cf38abd0f0fde0d17dd
diff --git a/dev-lua/luasec/luasec-1.3.1.ebuild b/dev-lua/luasec/luasec-1.3.1.ebuild
index 56a3d8392158..8371ae1e3422 100644
--- a/dev-lua/luasec/luasec-1.3.1.ebuild
+++ b/dev-lua/luasec/luasec-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brunoos/luasec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-lua/luasocket-3.0_rc1_p20200328-r103[${LUA_USEDEP}]
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 2f5e58bfa601..6fa450872b5c 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,5 @@
 DIST mpack-1.0.10.tar.gz 16256 BLAKE2B 56f279be5b84e89a18a6010320eff9f006cfba6df9621e7b4c338a866170a69589e9e50d0d7deb238ff40634f28aa4d0c43a135c6b7fa9a38ec41b8b669945cd SHA512 879e200d806a4aeb3dc31bf44781bb92b377ee86fe3050692179bff794a2748c175135e4ab5eb59f29202bd36ff27ecc26bab07d0c46c11414361f72abf3dc53
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
-EBUILD mpack-1.0.10.ebuild 2302 BLAKE2B 2f8039340d91352998fd3a1a366edc12264c9816f1eaa27aa5cb200ad405847639d4f05ab48ec2c5a3dccf44e8a32a66b09668d8e47cd18f22fcc3ca44147a01 SHA512 98d2a1fe6aa9c22a4f74f43e1710d81cf1b78972b74e1d9d1ec7754ffe704f6421be2cc16e79fdcd0a4c29313794239b38d97d4a2af52cc544060d1b2295f951
+EBUILD mpack-1.0.10.ebuild 2299 BLAKE2B 32f3f528c4f591833dcb839831fc61bd4922935d4fd30ef42662be2dabb9bcfaed48d993e5025e15f16dc78021e097f33740df7fd185cce9e57b1a7e290a945c SHA512 a5b86510731627ca0ccb9c1292d3b9388810f564685fa0574203564fd58974f67b94ead5bcddba3b77eaa9154a76091010aa07f10038f561ac9cde23ab0212ac
 EBUILD mpack-1.0.9-r1.ebuild 2299 BLAKE2B 81972f5a84aa553852c0c6fc59010e1f67116280ea0e2106d0dadd9bc1f6cb3e990367561c5790f8b646c65b49c8267a83d343021ff3c144f432ef94f0468ff1 SHA512 1c51651b30ff803991d706755ae64262e56c629b701d5487e6e9f5f73b3a9ca8278175cc772f916bc225541d6ca311af7412f87658abd91452ce5289c49efae5
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.10.ebuild b/dev-lua/mpack/mpack-1.0.10.ebuild
index 1c6415df4d35..2924e676d514 100644
--- a/dev-lua/mpack/mpack-1.0.10.ebuild
+++ b/dev-lua/mpack/mpack-1.0.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1eae48e5e8ea..d19f75b91cc1 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/async_kernel/Manifest b/dev-ml/async_kernel/Manifest
index 2cd1aa80de84..76fc0a3f83fc 100644
--- a/dev-ml/async_kernel/Manifest
+++ b/dev-ml/async_kernel/Manifest
@@ -1,5 +1,5 @@
 DIST async_kernel-0.14.0.tar.gz 138191 BLAKE2B 0f8096eb1cfabcdb4b3148f8d2cb3d5f8c858da74986ac107e7592195dab6e6563c0adb8f39f22a8d3b279b994c937e345b6c56d03a5767672913c7316ecd1fb SHA512 9324f17527311e3c112203b7caa2b0b7dfea15bdb30d02d7218c7b8d8c930d4893d83043016ad064265cedc191985400dbaf2d0af448f840c98ef98326aac8ff
 DIST async_kernel-0.15.0.tar.gz 148527 BLAKE2B 535a64a204332bcc41e6c4ef5ff78fa81ec785bb29404b278ba93e093452354b045aacde98b0f2e6598bcd5fe29a86ee476f2f48f018c69acb7d217d4ba9a60b SHA512 35bf6561b0dfcfd1bfd786de9f47a78deee5718fb449de648f9b1cfd2568c00cd7044b33dce12ce48d1ed704e61fefe3f2d2b1681c9f73c6fced0aefb0423b63
 EBUILD async_kernel-0.14.0.ebuild 508 BLAKE2B 216bf5e5292aaaeb4013f0033f713fe3d5f31145b8df65b48c6c5489bcb23ddb60d66dd8efef1835061fee37498435e4803f2d0d9a36f819e10c89358c7fd7c3 SHA512 914de6610883bcb0589b07a7a89e6b15ce7279594822a5d3bc28f4b78f3f5c1d6654ab57153c7c09e43b254beab06fb1239a07c54c2eca6edc28767a1918a6e5
-EBUILD async_kernel-0.15.0.ebuild 494 BLAKE2B 66e739d4983fbbe99fa05a13517e5b832f37e7786479b765c3f13fc3654d0dd323966b67c6121c8ce4bd61313fb845b464990acce0a5f6f15bc62b50b0a17ed5 SHA512 8419d98670d7218ecd9ab4e542e43f72712b9f92612b03e3c1cb71150cfd57cfadde31a29f64fef4cec88e7870e2b6e666d347e9babebec7caaff3e587a24500
+EBUILD async_kernel-0.15.0.ebuild 493 BLAKE2B 386d45cd87216360d97e7e7e57609cd2271924f391e07690f4a0f8e410b4048578de29b0cb31b99e8d61ed60aeaa31405ec64ac3bb664601e26826f158cbf26f SHA512 99a2d158f9394a63bb6db2f68af9724f9027c9fbd839cd0c3d7a54c53f159b215afda5a20c08bcd15104df6b5eeaaab95c0eb423b22ae4334685d6d3751d511b
 MISC metadata.xml 321 BLAKE2B fd8db9f53c6506db9ed49966b039aa07734345b6e0983e009e6fb9bee82fd7dd4e15ecdbb791503ce7f4ec3fd9fac2751f02626dca8a86e2fdac640919918d67 SHA512 a64a7d3dcef7d139eaa027b590915e6d4171daedfb4ae2d83ebac996edfc107e2b345bbcbed096629a23ef6f6d923497e09b5a3e3004160d33160c2b7d16d658
diff --git a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
index 3346f3288e03..b04d6536d950 100644
--- a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="dev-ml/core_kernel:${SLOT}"
diff --git a/dev-ml/base_bigstring/Manifest b/dev-ml/base_bigstring/Manifest
index 8d972fd5c050..45abaf2c7d57 100644
--- a/dev-ml/base_bigstring/Manifest
+++ b/dev-ml/base_bigstring/Manifest
@@ -1,5 +1,5 @@
 DIST base_bigstring-0.14.0.tar.gz 16579 BLAKE2B 4708fc425b9a4fb534b10b3536eca11bfd4ed8374319f9be09aa981d1a2a24433a25b62cb3faae459a0a633a2ebe6c15a28c2c15251f2ec9505c35528715de16 SHA512 d60bfd1989a29e4c1359722d4c0e2ec382c6d4f3c763b9b80980f38b51419bdf9d30bd9f8ca9cfbc33064458415e227c9f4077d9746ffc13cb4cd5ec8e221fc4
 DIST base_bigstring-0.15.0.tar.gz 17266 BLAKE2B f557fd8d46ad33afb89f50f914c76b287b19c8ee33a620c6a1def5379d59dd7f73b531c4077a3c7ce9e2cefbf6f71c7e49b3dd21213c68507bd19b0c90c44bf5 SHA512 d8311312ea1b3dc3a1a30c87ba4984438ca2c81f8da9cbb7f111dd74fb9b16ad8226166ae2fc2b572a989af15099b07294a667646b0ab22130de4406da53230b
 EBUILD base_bigstring-0.14.0.ebuild 1001 BLAKE2B bdf7a42226a6d53ee3f05f8ff43b5a1a1651e8eb550a6cb6f3431f62ab14c436c5c2cb9c8ac019e497b0bdb5426c4e8aebb95363b44e13f5a8bb2148dfa2783f SHA512 5293036194feec3af8861c581117740c96e6630d7561c6999a62863818ea37a1c1c4e43966add9d9527f88b2d645ab132c769912a8e4c9656fecb3aba63c96d4
-EBUILD base_bigstring-0.15.0-r1.ebuild 511 BLAKE2B 4fdb0cda3987ecb4848c69f38866d47fcbb2ebe9c5c96d93c135c5094dd096da47834cb7a10ef7702495e7f4b22ad9b8349cd79dc99b57eb5a734230ba98a48c SHA512 094fbfd9b97b1da8af167f0c7d90f7b1e3bf51ebbea36ad5bfa58f9e1ff2dbae252f8f106e873d66cc0b047ef40adf0110588f9676cdb8edef7b6d69df734d79
+EBUILD base_bigstring-0.15.0-r1.ebuild 510 BLAKE2B 2335a3762cdd78188aacf6e788839ddc570792edd12125255e556e2dd01d86cc04fa497e79f0b72268bf646afae55bee7543bfc97fa11ce3eb2ebd98353a83df SHA512 82012415e2f689f48e7ccecc93c94af87344418cad66dd3490116d650118d10fe86cd036fefcab7ce3e4c28603923f1a19c6fa25b61a35be613b7beb0ac35939
 MISC metadata.xml 323 BLAKE2B 3729ce1b400ce788ad528fc85ab4c404b3a02a35051f1d73059878ca255fccdbca77cecc62dd1f1172452c4879b5dfa633acc4e5cfdfa3275f7fc4eab80db3e1 SHA512 a1f3fde83f77f720641d14178a1711ce34bae7e4de33a40aa26dd2d56042722019bb5f71011a6a516874013fd7925407fbf2f60ace38b006e00bf45b54c75f13
diff --git a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
index 6287250514d8..4770de8e99a7 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/charinfo_width/Manifest b/dev-ml/charinfo_width/Manifest
index bcd4bb0c8e54..eca669b18715 100644
--- a/dev-ml/charinfo_width/Manifest
+++ b/dev-ml/charinfo_width/Manifest
@@ -1,3 +1,3 @@
 DIST charinfo_width-1.1.0.tar.gz 8307 BLAKE2B fcb37b82e2eb914322c78bcfebf901d713b55edc1c069b46cb157bbe1292b63aa69f4679f9077308a17e7d31d7c972e6b636ce7dad22fc963aedc33039dfbcfb SHA512 c8dac9eb6f520213de69b23433e2f0d6a21578c70ae69fb682065e707363968959395a6ddc6c88893e08372a138287318634b52a8b4fb70ac988b4ad4a18b140
-EBUILD charinfo_width-1.1.0.ebuild 550 BLAKE2B 9463df45de66f3c05a2c293ba76fbb912e58ad08cee699d4f77504005dcfd1a38256a2ce0d1d1c185ee44ce6616359ece1cc2932ec7d778ecc003c55692b7aec SHA512 3c89edce883b866ed39e06b76df0a3fb93702205bc0d912ae706f48d631cc586d360fd8353060870c7314f108dd6eb708e8ac6184224d06f8fa8e5c0e7973e43
+EBUILD charinfo_width-1.1.0-r1.ebuild 557 BLAKE2B 76a4de79be94ccad47d924951d6c78081fd30f8ecd1c564734e1129805bd5acf94264f1ebcf7419011a0785e0a5729ce2b4a5d28ba551583dd95718d80093b8f SHA512 4e1d7f48e5c608b06e46a4242df2d808a6a60c8124748b06fc812b6b677b9dab2d0c15bb16fd6cc60810eb66337712791e462f2afaba9ceba98ad39fb54d4d05
 MISC metadata.xml 400 BLAKE2B 7153a7494e177bc1660e135a0773c0012e4caad4b245eab089f893287ecc73b3f9beb131bd254e8f1ba64deb19db0cf51dc4a04bb573639a010b883e32858b97 SHA512 579ae1cdcd950e9ed124a38c6768f5bfe9d0915064ee30be5ce20a0c06d988e07ce9bfdbc31c5be43805b9183cd648402e80253331d458020a9179312b425648
diff --git a/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
similarity index 87%
rename from dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
rename to dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
index 93fb360c531e..6191c758438e 100644
--- a/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
+++ b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="charInfo_width"
 DUNE_PKG_NAME="${MY_PN}"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/camomile:=
+	<dev-ml/camomile-2.0.0:=
 	dev-ml/ppx_expect:=
 	dev-ml/result:=
 "
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index bd737502023d..98b74e1900a0 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -5,5 +5,5 @@ DIST core-0.15.1.tar.gz 522517 BLAKE2B 1dc1245708f392161ce04ab121dfff550f13a8aa7
 EBUILD core-0.14.0-r4.ebuild 688 BLAKE2B 0236d0a340235aa8b2dd9a03fcdcb137dfb18daf160953852bed23f5b29471f8664db40618e744631c92648f73fc23c11e2b5309d8dd64a5ddf50710bb000e8b SHA512 87276c8dfdc8b2fce059a3dd4100d31b131582af46d054521bb496e207fec897b63ec8abdc900c66bb7e93a9e605100194239e8e61394c8df34b06c483b72444
 EBUILD core-0.14.1-r1.ebuild 747 BLAKE2B 6944e4b04b458ff2ffce30cbd4b27c0b86f0aad00ac3596c042ba4c1a1c74918fad2606e521651e6676e054639fa7231042d1d8918b58383d02ea7caf8d58d9e SHA512 5659a08e8d772ad14528ff703e1ad4a39b82216e000bcab8e2da1b93bab921da4268c135cdb5800017e5d790c468fd802e173faf765de15496228a13e233ba23
 EBUILD core-0.15.0.ebuild 537 BLAKE2B 1009f951e121d88893a36c3f6e14b79b468feae3169a6e315f165322198d10ba19711e7d0d5e5d6628c90b984f34ec5942232a4da9a0db35c569244168566462 SHA512 8f6f276d341083f229a92f3e41bc8201c6a1b41c3ede0b96d4d13d6672648a0a2e923f6d003221d6b8874e867dfbd528826991e40a943d0644b1424ed0a24138
-EBUILD core-0.15.1-r1.ebuild 1097 BLAKE2B 7a56e043d73e76d989bc13eb16e1ad7fcd89a82a13dfe32be67f6a535b43af5c6e29552a95d005ac6449e3083ff7dd0d2b4f4cd8431a5a50b06114331c25de42 SHA512 7f7aa082f3341a21ee2fe4a7ab21f3b0e1204352e2e695fe40a1132565990e8592badbf7a3feac27755267b387be5dcc5e9926178a14b4ff9bbebac42d95f0f5
+EBUILD core-0.15.1-r1.ebuild 1096 BLAKE2B 85a1b91cadd571759f299faf03e643167ae36effe180cefdd8c81bb836fe553bd4a7b0b9b99fdaf4c15f5c30a671d1659a4c34a32574b519388550137fd66e66 SHA512 74187f81a3e84efc2f23aaff78a1c1876984a2b2ccad5cb54370c99d75fb1def2555c6e2db9bfc93c67485d8a713f4ff3a066b0c881b1f12b9008f4604bcf0f7
 MISC metadata.xml 710 BLAKE2B 368091778c4347e69ea5398a3f6013d1741bc9fb20acacc861de152c8afd90d9647ef7b31143c26c7e50e0285b52f2a8688b7203821473004a9b237e65585dd7 SHA512 3d29e7a8c748a4849421fb73a1f1225f6480d032d8eb8bd70870567c8f2ac50ef1504c368204f6f063f71f5c984daff98a1109e81674abc8faca10c5a3414efe
diff --git a/dev-ml/core/core-0.15.1-r1.ebuild b/dev-ml/core/core-0.15.1-r1.ebuild
index 42869f95d733..d25a98461f40 100644
--- a/dev-ml/core/core-0.15.1-r1.ebuild
+++ b/dev-ml/core/core-0.15.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 # TODO: Wants quickcheck_deprecated?
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index 51c3764886d1..917d46e0c9b4 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -3,5 +3,5 @@ DIST core_kernel-0.14.2.tar.gz 701911 BLAKE2B e784d6d8f53df03ffb56075a43bdfc82d5
 DIST core_kernel-0.15.0.tar.gz 265183 BLAKE2B b1e67e8a84e1abbb23ccfb65c8320e36b3b2f91be3c2aa02e73b53c411e80da65c34b69d538d027417a52fd1dbb1a2217b9020d86ae00237ebaf3e7c06b35e42 SHA512 da28f11374fda2e869b5ef3f7131461c6d896b52413654f2aeb7c74bc77ba4a8e2a25830eb3e3ef393e0bbae903db20f54773b356c53cab75c1bba1b9ce265bc
 EBUILD core_kernel-0.14.1-r3.ebuild 1032 BLAKE2B 50eb6684ab6cd15aa6b2e328d11c19f9b8a641e7952584b08add5ad98296e46052066973007b811da43f75d0cfa44c6cc645a1a2126725b3446cebd66f0ec4b0 SHA512 39fd1af966e29654d3f37c141a6e72d8cd8bf7379cfb568186fba00c710ac1817178e2311909c169c1b687688a844f53d9365ad7523d561f51a208cc3fd20091
 EBUILD core_kernel-0.14.2-r1.ebuild 1075 BLAKE2B 0a88db73c4a3a93e948d624e235d72ba70fc5e960ae68c3472881a537ff0fa5d0690861824fd7e501e9ac384b9a93b6c3b17c600686221a83d1be73d4b1dd8d9 SHA512 b4d1ddd8a0f1e8762786c6b23fafcb388c20e7fcd842e51a876204993942b90a328f8ef36f7f81a9cf981d64f4a2d5d93f436642fb93be761d103da062737224
-EBUILD core_kernel-0.15.0.ebuild 569 BLAKE2B 44cf207d0b52fed3c4a837fe09f61c4118a75557f3ab1789fd177d791a4333c64665796c8f5fa1a60f2f70d2ee2c8f92e40649d5ef44cc2bee4e1b5c5d573ad1 SHA512 36c013c14cafd176190c90ab6d71420f626af772c9b470ec099e6bf649bc87bd73b5c082240ca50b8233e2ffc2262923cc15afc81c3c7f59da84fe0290ec3b85
+EBUILD core_kernel-0.15.0.ebuild 568 BLAKE2B 6fd89cebcfa7c4eb7a52a1756289be36358f89beee47bf4c3fbd97dbe25244003acbb6620e3c08f3bf39846bf902e64ea114c42f42bbe4e7bc8f9ca1583f7eb5 SHA512 e5049bf9f4ba9c950693f3d6f055ffe549067c742e02ccad53b6ae17a4fefcb8733e3e807c17dbe27787dcbca1a7ccccbe079f0d2421ca63bc158a3bd28ffd88
 MISC metadata.xml 640 BLAKE2B 411246c9f2ad1ba00a0475e8195d3b54a0ffd9b7c6804c10b482540e6c27d683451ed63d65f48e2dcab87a53a69fa6215590c8b2f8bb951266697df6226e44a9 SHA512 7854d4748ccc7833d4a029e8ee0fdef9d91c2552d916d77bfe171590a1de6c9e547675e04c886afe9b5b6de8c34e200f6e52a193213ae00ce70f5823fa363292
diff --git a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
index 08a2e74406c0..b24833698db8 100644
--- a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/int_repr/Manifest b/dev-ml/int_repr/Manifest
index 5a5cb106a5da..4f6678bb09a0 100644
--- a/dev-ml/int_repr/Manifest
+++ b/dev-ml/int_repr/Manifest
@@ -1,3 +1,3 @@
 DIST int_repr-0.15.0.tar.gz 9105 BLAKE2B a2a8197cdba7c4805c9eb9402e1c853619fc142bd057c4b42a578bcfdc97b417751634a31bab1ccd5c2e75cfbef46d33b6daf76da5ed4e3c9ec26d5c81fd3b73 SHA512 96537591fc597264347f967757df979344224f84594949bca96b40298e4ae1d7b28b40f3705ad4f85e3801724c6388fc048271216703b81fda0e56a314f3e88f
-EBUILD int_repr-0.15.0.ebuild 475 BLAKE2B fa086f765d4b044199623f132aa3e4957cbc4c621412782d9d22ba35d4f18f83a0c03fb964dd3c11cee8dabc453ad13ef3ff6c42bc6a1f0010ee734ad107c356 SHA512 135c454f5962be1a8ace05e425e29d42f6e3c2b77d73d64044a1fb6178af3fc83e41f8356addabaf282943f6a0f2539f0708751f61e74da067e7fe31b4f6d699
+EBUILD int_repr-0.15.0.ebuild 474 BLAKE2B 3a476d6d6052fd6218bc86d7c34777185c3b47f93538681fcc1105f73346e6d3d8a0ff2f3bdba6fdcc163b5578cb8c9d6ed1c3ee194d51fd5ef4325eefb8a232 SHA512 8686264fb67c278decabfb91edbc42728afc52564fbaf7503cb711fb3800330bad2ee9b9dd8b2ae723244fd3bf25d1f15c35f860f4d2b5714a6980cbac30b01a
 MISC metadata.xml 317 BLAKE2B 58b512e27ebd93e11da8245933f2230bddab2c07234c6365b8f860c70fad16866cd6e5a98559034d962c2cc5509d0346a9b6f9e88dcd663967432f4e38c70f0a SHA512 1e3442d580d84254768050b55eafcecaa4b1749404879f5443514c45014d9e0110ed72375ebe01b44603faf98035f1570f5820f9f4e9e448a627d6498fa65c70
diff --git a/dev-ml/int_repr/int_repr-0.15.0.ebuild b/dev-ml/int_repr/int_repr-0.15.0.ebuild
index 35a80379327e..14ac62ac39e8 100644
--- a/dev-ml/int_repr/int_repr-0.15.0.ebuild
+++ b/dev-ml/int_repr/int_repr-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-ml/ppx_jane:${SLOT}"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index ef9577a5c7ed..c1b48d71a354 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 40fea3429bbf2e22f45598a679d9e5c6fa06343081a3a0a7c238bcbc8c3f270fea924ad57cab4f580adef66fe269eec188e6ed9f46772907063267805b7b51c7 SHA512 da649915c4804091ac68d9011a2370560f71e88952d13975a5f882e2c485d561fa0a5a43c61dd48f196534eae1e10aa6e46a9a9f6959d998ca850128c75a2615
 EBUILD llvm-ocaml-15.0.7.ebuild 2598 BLAKE2B 22f3c86bea3a17027f4513685ddb9077800918dbe8dc74dd17e7d8ccfb729c11baf6eb60915d6795170d4dd5ee66b5c19d16653044a0ad7bb34f18161db06848 SHA512 04de6e60fc31644b6e99af4277f5300cdcee1f8e35f9038b490ed7841fd0c92e71bdaa423cdedbc5cccbd219e32857c8d1d0e09dfdfe4919b165ee73670efbfe
 EBUILD llvm-ocaml-16.0.1.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
-EBUILD llvm-ocaml-16.0.2.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
+EBUILD llvm-ocaml-16.0.2.ebuild 2532 BLAKE2B 86820fc96e57f380dbddbe673423362925bbbd52f8fa98e3e8ce8f108c7999e520391db7a076c03351d83c80b662e1edb6a6e0f71a2d9b3aed8445d659eb8e16 SHA512 77e408a5f34d83abebef58df665767be4a059868f77a5e03f4edb29e20a317e4da057b7b6d473d55c9d398e24c389e911cd9153af9934f4b95d1a6b8bc6147ed
+EBUILD llvm-ocaml-16.0.3.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0.9999.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0_pre20230325.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
 EBUILD llvm-ocaml-17.0.0_pre20230414.ebuild 2516 BLAKE2B 76d79ec543029a6509d80817106cc94f880844269c65d5f648c5fc3623fc837b668cc1f7071cf04fa9cce36f8c7a35b238b553a3f2428f01ad76123fa3e9d6b7 SHA512 d42973449686da7c3e94db660026991293d997ef4705580c01903432fae1a990e96e96100dd8ce27cb7ef126d24e003f4f1be997f5abbecdf273db5b4fde6c4e
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.ebuild
new file mode 100644
index 000000000000..d5f0179fb951
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-16.0.3.9999.ebuild
similarity index 100%
rename from dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.9999.ebuild
rename to dev-ml/llvm-ocaml/llvm-ocaml-16.0.3.9999.ebuild
diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest
index 05859f3d6c2a..a2f2a35e2685 100644
--- a/dev-ml/ocaml-gettext-camomile/Manifest
+++ b/dev-ml/ocaml-gettext-camomile/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-camomile-0.4.2.ebuild 958 BLAKE2B d51c009980965418c634ee867e47d4a5c61338e98c2cf575e0e041d0dcc43c3847cc43c5b40aa12dfff12ad6859779161d9d97d210d6f3295dedff51e584e9a5 SHA512 07d87a1dbaf7e26ba05a11fde7c2e62380dc49cbc4f2bd546249bd61166773d91c2b41796b138a1a33597f996c6ffb0f9615e421e932a6d58d729678bc7ddbb3
+EBUILD ocaml-gettext-camomile-0.4.2-r1.ebuild 968 BLAKE2B 38c504e43a2da80a9f2c282dd3fd9235f130b2563a387c61bf31cd12df6514a670ffcf6c38c37aced27e70209c94d8a83dd67e0810385bca0b1398dbd7b5f39d SHA512 f63d06e03db98ecaa269533dce6ab47894225d60ca7b97246d4874ad8a0cdee3384b7dd0e46b1303112cbc54b4a61a4553b560ad64b10a311126fbeaf4dcd564
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
similarity index 92%
rename from dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
rename to dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
index f55d99f5f09a..a9d71a8d2edf 100644
--- a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN=${PN/-camomile/}
 MY_P=${P/-camomile/}
@@ -17,7 +17,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="amd64"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"  # Tests fail
 
 BDEPEND="
 	>=dev-ml/cppo-1.6.6
@@ -25,7 +25,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-ml/base:=
-	dev-ml/camomile:=[ocamlopt]
+	<dev-ml/camomile-2.0.0:=[ocamlopt]
 	dev-ml/ocaml-gettext:=
 "
 DEPEND="
diff --git a/dev-ml/ocaml-gettext-stub/Manifest b/dev-ml/ocaml-gettext-stub/Manifest
index 8349a62e60bb..8a58afa3469c 100644
--- a/dev-ml/ocaml-gettext-stub/Manifest
+++ b/dev-ml/ocaml-gettext-stub/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-stub-0.4.2-r1.ebuild 979 BLAKE2B 3a7f3e3b4e1d08b380933cd6f33c01c631645e52f4a83005fb97fc5e922729462aafee07febbc5a9fd3a7496610213c571c3339faea422dc8495fcf5e57218b6 SHA512 c9b32f4239353ae539a85c85b82be1155d6e3990aa97772395176a903b599c1b8fe2111d7531ad3d244cd715002b8026d37dadee00e31bf67263697f459534c2
+EBUILD ocaml-gettext-stub-0.4.2-r2.ebuild 1107 BLAKE2B a8fda41d3bdc90ca706868ed9466b68bd76a542d13efe0981bd4d7ed0dda4c0a566c76c231468e95198b39a9d4d5c853336c0834ec43f56257db29aabeeb3605 SHA512 d9f35d334e0777f142975338480edb22f8c3fc25f055f0ba40e5a7798d29b143881bd388e98933beac3974ff9584837d1cf8ccd7dc1aa8e9047e7b770150ff0e
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild
similarity index 70%
rename from dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
rename to dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild
index ee1414b5f36d..c678d9199725 100644
--- a/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
+++ b/dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN=${PN/-stub/}
 MY_P=${P/-stub/}
+
 DUNE_PKG_NAME="gettext-stub"
+
 inherit dune
 
 DESCRIPTION="Support for internationalization of OCaml programs using native gettext library"
 HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz
+	-> ${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="amd64"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"  # Tests fail.
 
-BDEPEND="
-	>=dev-ml/cppo-1.6.6
-	dev-ml/dune-configurator
-"
 RDEPEND="
 	dev-ml/base:=
-	dev-ml/camomile:=[ocamlopt=]
 	dev-ml/ocaml-gettext:=
 	!<dev-ml/ocaml-gettext-0.4.2
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-ml/cppo-1.6.6
+	dev-ml/dune-configurator
 	test? (
 		dev-ml/ocaml-fileutils
 		dev-ml/ounit2[ocamlopt=]
@@ -40,6 +40,11 @@ DEPEND="
 src_prepare() {
 	default
 
+	# Remove dependency on camomile (see
+	# https://github.com/gildor478/ocaml-gettext/issues/14)
+	rm -r src/lib/gettext-camomile || die
+	rm -r test/test-camomile || die
+
 	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
 }
diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 12b90bbfd269..3f6e916e8e23 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -2,5 +2,5 @@ AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca0
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-0.3.7-r3.ebuild 1595 BLAKE2B a36e1429b377cc63ec4a94323cb10daacc105e0962e73336e4a3d46434e720eccfeec2e4b954cee27e5a179134f3d4847617cab42456011c7e0bc71a77a5d6e1 SHA512 360e9429a63483ee6a6d13b83f227a738b61ad0cab307814ec812da3b843b7b7dffd7bb46acca9f416b82214b585a9ed2007ea53376145c708278c2f6b09c0b7
-EBUILD ocaml-gettext-0.4.2.ebuild 916 BLAKE2B 70dea9b198f4574529ca9f28aa369b0e68a269cced3d9d0c82743771e73e353284cdf00d2d9133c1950e36631b52ddb5baf7f81e42a45b46f99c71abf07b8086 SHA512 d8238c886634cf0fc455f918f2e329f4b2670a721f0f84dfec01ca548cb32acf33df889ead2230a19d15a9ae3480b2a960ff7babf6b7e83cb486714059f381e6
+EBUILD ocaml-gettext-0.4.2-r1.ebuild 999 BLAKE2B dfa037b3a678ab7287b0bcf612533b6d48e531d758b45afc210c0bb2e26e7d9cdbd6651c7d530caf2c7c2a3aaf81022eb6875635b1a8549df1a7f685b3263e24 SHA512 165bf945e71a5ac31e9515802d9a55e548030819b5fdf2332df18d6b76e777a20f901ca5a925cf92993322d49c6fb61264b98491a751b1c72979a5b46234f0a8
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
similarity index 72%
rename from dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
rename to dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
index fea75c4363e8..d42dbf39239e 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DUNE_PKG_NAME="gettext"
 inherit dune
@@ -14,15 +14,15 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~x86"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"  # Tests fail
 
 BDEPEND="
 	>=dev-ml/cppo-1.6.6
 	dev-ml/dune-configurator
 "
+
 RDEPEND="
 	dev-ml/base:=
-	>=dev-ml/camomile-0.8.3:=[ocamlopt=]
 	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
 	sys-devel/gettext
 "
@@ -34,10 +34,11 @@ DEPEND="
 src_prepare() {
 	default
 
-	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
-}
+	# Remove dependency on camomile (see
+	# https://github.com/gildor478/ocaml-gettext/issues/14)
+	rm -r src/lib/gettext-camomile || die
+	rm -r test/test-camomile || die
 
-src_install() {
-	dune_src_install
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
 }
diff --git a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
index 5a0ba13b6ae0..14ce133054dc 100644
--- a/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
+++ b/dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Easily build XS extensions that depend on XS extensions"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/ExtUtils-Depends/Manifest b/dev-perl/ExtUtils-Depends/Manifest
index db52863c2533..90e8af49521e 100644
--- a/dev-perl/ExtUtils-Depends/Manifest
+++ b/dev-perl/ExtUtils-Depends/Manifest
@@ -1,3 +1,3 @@
 DIST ExtUtils-Depends-0.8001.tar.gz 16708 BLAKE2B 59342f8c638b9dfb60bb84a7abe8baca08d00c40f5da62553d1d7337f3c92f473937de1721302d222cb0567a14428b33f475f3304104030c358fa3d025dc13fa SHA512 80141f90fbde7c62b192a55d40d26ce4e442150287ae6fe200388dc84cedba5f5210ee6cd9a40b1a9cda0cc49815b1ba1ab35e75afaa7440de3c3577d01bb733
-EBUILD ExtUtils-Depends-0.800.100.ebuild 660 BLAKE2B 22590c905146a400eced5931b8f72a56d0b2a5ed73c2d309e8d809094f53ebd079fdd43fe337467ef25c7e1c5319fd4aca1dda9adb1633b8add37995b1585c69 SHA512 280fda5423730f4b474ba85a462b35e6daa547046f5d0b87352c02140a8637dc860bf52ed90fb6ae798e289d011412c4056b3cd9daa50512769b04ed2c35ce87
+EBUILD ExtUtils-Depends-0.800.100.ebuild 667 BLAKE2B 26eb8fd51ea43771162e218ba962d30ede3bca00627823471dd2d167c429c5e69d2aba3448f4a53b320237e94ce4ba11236482e71704ce70c985e3af2b72a276 SHA512 25874237b9b75c56ef9b0217463c09083327d5ce439d4044c57daad6309d8f8758b80d2c86759f94a958d08bd0b39464356175cbceb646e04c66e2c820ea54fc
 MISC metadata.xml 405 BLAKE2B d4013938a9b37431eb9755d04b864799da0930d8241e818dc96f6d9563a84a5cc4eeacfe541a4b123757292360819cb7226c54739b081328616a77b23f1022a7 SHA512 dfa5ef6504497d0635a405247dab8bcba56823c6956a18f2d3ffbf61b8221e30a97d62a7c105d708af496cb3ea51d101a40dce0e170ed6c8c96eced67a5979f5
diff --git a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
index b47e4e54efdd..24cf1f9414bb 100644
--- a/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
+++ b/dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="A general logging framework"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # errors out when running in parallel
 DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index 81a96c0f05e7..151d13245600 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -1,3 +1,3 @@
 DIST Log-Agent-1.005.tar.gz 57364 BLAKE2B 1c5eb3fa6da20ceaba7d63bee1a79423bbb233662921fce9956a735a34b2994a903c58099cdfafe811130714fcac50e4c87586e8b8b058f591de5d6e8eed6f13 SHA512 9fb1c2377921b4a3036a24f343ef52ea05f569c27600d289f568a1544aff7d1acd4426dfec60b63879424360a27c6f7bff684e9f7b17aa5d49d3673c35bb65f5
-EBUILD Log-Agent-1.5.0.ebuild 488 BLAKE2B cfd762a7c4af5ef4a92fb670074f448d3540b238d1bdef2987bf9ad00b62717aabd2d6c8e7f29b1522d0024f4dff2e8f5fcbffe5ea5b369e8b19f2014d300c0b SHA512 aeb6a2b1a1b5c3a8f02abf4a6b6be94e6856635b9b2ba94ca35ba99f8630583715c273f137e0bc45ab7d01c062688a1cdae874d98c4d02d0f02323aaeb84dd60
+EBUILD Log-Agent-1.5.0.ebuild 495 BLAKE2B 84f5979af39ce8fff849faa9c6f2e88febb6d20e391398c9a8e5bc63c0a7aa704093f8585060099278a76c5af5957419c3196a07971d584169b891d0ebebf5ea SHA512 83267893553abaa43e66cc1287edbd3a0c732ec5da3f709f1f386f03e408cb6669c9a2989826bbe96ac2be09f82ed074625137d4368e3f5141a0918286357384
 MISC metadata.xml 2137 BLAKE2B eea01340c9423795b944a8dbaab0cae59610d130e27a1d675c74938fc53d71142efe6bcc4faeab9cbb14758752c64dfbc653302633cc6cd75013ffa1b58f5ff3 SHA512 dfea0697989ec9b7f19b7c78029692b951af430a12bf2fcb3799f05126c646e755789526a7cdcab40c3bf00e825ccd89cfc9f0a37b1b65028582473bc3f63efd
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 5684ca1616ea..554c0b2c08e9 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index d1c0f7b552ec..e6f31e917bd6 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,3 +1,3 @@
 DIST Glib-1.3293.tar.gz 302831 BLAKE2B f2554db363d4966e90f34439c2b014a30ec1fd13add587ac4d72558c2601796e53d8b89de052daea2d5e2a900d2b7928b9005fb9e197e167767b2fe1ff4c4dbf SHA512 139033e207ba9b12eb8701ea9e6e363f6d36e68320cb1a8b4d5943722fe80330594e42fd6d8061794d97dbdb06fdcdd48efea480a254a1e8981ea70e933346d4
-EBUILD glib-perl-1.329.300.ebuild 896 BLAKE2B 688b156e20bdac48b22481ea11179a33f73c9b915633bdee0e43740aa832c813b8a0f39ab55bdaac469c1a2aa8a551bbbe7d5842523a6fd994eaf0265ae64fb0 SHA512 ee49a3ba5beb6606c89ca87b065871a3d43720cf341d0e73cfbe87686fff0033e168a881ea3fd1fbe6c207740cf3b427f9406f78f3b5eeda1165d0b8efbe0eca
+EBUILD glib-perl-1.329.300.ebuild 903 BLAKE2B fc31aa2331e3e76cf8c6b8db25922f619bbf46ae2b9b4f704aa0a5abd964535b3c7bd616df96d8dbd1cb83f904eca71562f9ff929f81e1f5caeeaaac1e65b600 SHA512 5ea1a2086085202dcb23fd9a363cdea02b320056f4eb1e68054594b8c41ddf0f8494285972ee3f982841542fe78b0de7e96d69092a2696b5704d8079f8b19750
 MISC metadata.xml 1366 BLAKE2B 22fe9a69112a56332288747a0fb9dba65038e2962b691447b9ba4aa25451791355dcd189f6c88099ddab3935e0a1b2a2d199398b9bbf49dee4653cb0bb9931bf SHA512 db6b4c9fb4bf0ccbf6e04d9a1d4a2e8b5fe4b321d57e8282deb6c3bc2185fe5335e09ffe8b92312c89f388e2d335774074a3f281ed924e75a734ea6a0eef2015
diff --git a/dev-perl/glib-perl/glib-perl-1.329.300.ebuild b/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
index 77ec4f0ec838..747259c6803c 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 4c869bef1334..911d39318b82 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 762a04a67d0b..e6f56065a89e 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,4 +1,6 @@
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
 DIST twig-1.44.6.tar.gz 126880 BLAKE2B a838a5ae8bc82b6e0a39b55ba7d3817dd0ac0c2995881662fc5e7327a5dea83dea4740952282c9320016b379c08f02cb53a850004ecd2c919ca84da6267d0a56 SHA512 a443a700b71f982ea47187d9753ba9903e879f272ed53ff399211f5a76e7dd84774d5071a24cb8d5df6ffa754ce989fac152d0fe124ca460b8f167a553be86e7
+DIST twig-1.44.7.tar.gz 126915 BLAKE2B 2a88840cbea671dae367d39422d4b222e275236aab511fa8f5e4704093b53c3c8e5f335aac4930d84d43b05bcbe759993228de40d1aa2dd90e7b84ca8e5af7e6 SHA512 134d43f310f4277902ea06d632a7946de475ce1907cb33176f82cc49ffefc1c13b9d3f4cf76846c0084bb5a1636b001b6eb72d25e3770e118b7c1e4e4a30a373
 EBUILD twig-1.44.6.ebuild 1380 BLAKE2B 0db79b98e60fe42c1260922ae5a40bdc19c46619d735f92ad7317f2fe5b2c57c677cec695f642cd3ffa221fafe86769b32eee38045df13c1695e1b6f5cd25691 SHA512 9ebecbaa4b6eee4f12926d158173edfd7c2bbd27692249fb9cd9ed9794939c46e72afcbdc016c3f94c8cfa2097d6b9f5467218ca58ebbf50ccf7b8d622144e89
+EBUILD twig-1.44.7.ebuild 1380 BLAKE2B 121568c3e4875e692d6d2ce91245972d575c5151ac90aea25399c3501703fd9ab458eb6d26726bcf7e95a8289a020346cd89d7336563808eee25fd960799c0e3 SHA512 8fa7145e8325d9fd24cd0e527f10afba728e19de70da19455c46c38dbede061ddf80d2dede93079e8ebdaea228f1025be6fb08a12df5d717d9be52614a50baea
 MISC metadata.xml 327 BLAKE2B 88fc2dfec2042f7687e80bdbdff6f6d4ff93f0e35ff4215d2b0bab384d0110cc9510f00589028b24be51bd6f2260f422fd016d20f7d4fec15f8d7bb34ff33bc1 SHA512 356774e50c461602c6731d809b689c354455b3f36a2d5cad1913f829cfa1a0e8034cd79eb3299bd5d7ac6d37144e8334dddfb226aea3e171fda1343a5c90cce0
diff --git a/dev-php/twig/twig-1.44.7.ebuild b/dev-php/twig/twig-1.44.7.ebuild
new file mode 100644
index 000000000000..01310215fa64
--- /dev/null
+++ b/dev-php/twig/twig-1.44.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Twig"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="https://twig.symfony.com/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
+BDEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+# Test fail due to missing Symphony dependencies
+RESTRICT="test"
+
+src_install() {
+	# The autoloader requires the 'T' in "Twig" capitalized.
+	insinto "/usr/share/php/${MY_PN}/lib/${MY_PN}"
+	doins -r lib/"${MY_PN}"/*
+	insinto "/usr/share/php/${MY_PN}/src"
+	doins -r src/*
+	insinto "/usr/share/php/${MY_PN}"
+	doins "${FILESDIR}/Autoloader.php"
+
+	dodoc README.rst CHANGELOG
+
+	# This installs the reStructuredText source documents. There's got
+	# to be some way to turn them into HTML using Sphinx, but upstream
+	# doesn't provide for it.
+	use doc && dodoc -r doc
+}
+
+src_test() {
+	cp "${FILESDIR}/Autoloader.php" "${S}" || die
+	phpunit --bootstrap Autoloader.php || die "test suite failed"
+	rm "${S}/Autoloader.php" || die
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
+}
diff --git a/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild b/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
new file mode 100644
index 000000000000..35b4a12135b8
--- /dev/null
+++ b/dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://pypi.org/project/Levenshtein/
+	https://github.com/maxbachmann/Levenshtein/
+"
+SRC_URI="
+	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-cpp/rapidfuzz-cpp-1.7.0
+"
+RDEPEND="
+	<dev-python/rapidfuzz-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# sterilize build flags
+	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index b2f9c5095573..4a4352533efd 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,7 @@
 DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
+DIST Levenshtein-0.21.0.gh.tar.gz 36616 BLAKE2B 8408ba8231a8ff3f6bf9e6cc7ea763061ca1c826236d74877213caef0ce736695865dc3c02565cce960b794d07f96f6413ca144565d6693debf90a1b5718524b SHA512 bb1cf70497e89db5b427eb4ac79708d205fc9edfc9588d30c63ef6e3e77b9369c8892edc31c32cb135d54947e8eedb770d06a7d5c6f8743d44378d7d1a12d459
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
 EBUILD Levenshtein-0.12.2.ebuild 630 BLAKE2B 7f74159f1e57e0b9040b8b0a6af3c52d1c64661639b2f3ef1a569b5ad91d36a939c044ec3e4ba499158e57930285b8a81cf8a48e89b5b330966cefaffd015c4e SHA512 8ce08ce36977336487a1b870c2e474bc257f05db1b14b39cdcd56d5f0bb3cb14ab768ba6e13a79804f99578ff6dc841b7e19186b9ce6e1b529b4c7ac2a636b0a
 EBUILD Levenshtein-0.20.9.ebuild 1045 BLAKE2B cd155abb675212a0b0fc245d7ffa8c3bd8ae451ad4be29adb0b5b198bc5602cff51894b31493f19acdc2ae2107ee6e38b78564e40303ee020ec90b8949929fb5 SHA512 4355a6ac8bc2a2da72a20028cfbb5c8556d5c723a69b1776bf04b3e0570e457e3ed081f257476036379c05feda4320dbc195b6cf4a3ab71fa109ea35fc820b1d
+EBUILD Levenshtein-0.21.0.ebuild 1052 BLAKE2B 78c4982ff3a84e825de376aa38a9fb809cc59c2233d8f08219e07abbacc567c7b03eb193d512126989dceb464ef327fba6ad393c77cd254cd2c3a4743f60010b SHA512 971223c21f452cfe06615a81ec054d2b3312b7552757a6763864d9dc3db908adfd4e4f85851522483b6b4f0c0e04a950345d6930fbbf9afacde3d6b57da34402
 MISC metadata.xml 378 BLAKE2B 59900a9f2532c274a220466ff9bd5db4a4830b221119a95a0fdf82928b90c64b458b16c26257b69093ac08346bafbe54189bdb873bb8f119753a4f2243973eb9 SHA512 26b3ddc5d3843122a47941cb1e388e41f6a3f98e3f8d2f5108f50240b5c9005edb2b1e2df55c9046d48a8b4e07941f8ccd4fdee129f4ac948a47a6207b73c7ba
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fdad8533d7de..cb6568f3e382 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt6-sip/Manifest b/dev-python/PyQt6-sip/Manifest
index bfa6afa6b901..aa16da309e1a 100644
--- a/dev-python/PyQt6-sip/Manifest
+++ b/dev-python/PyQt6-sip/Manifest
@@ -1,5 +1,7 @@
 DIST PyQt6_sip-13.4.1.tar.gz 111256 BLAKE2B 548cf81a0a02183e2524bbbbc8e4c1e72fb91a744d7e23ecad531bd0f6d42fef4a2b893f84dd93c4f73ebc95eaef79e19744d1a9ceeb4fcd3497a2217d0f02af SHA512 267cdde9923e6f8522a7ecdbce4ee6c55f5733719b0326fd87ae91ec35c247176516b25a01a9addabe9391a6df10c67beab782fed8a83185a2cd5fdcd6fb4c50
 DIST PyQt6_sip-13.5.0.tar.gz 111338 BLAKE2B 37dfe20e4cfae0a4724612b99c5edf268a7adb59ae7ba460d266134d1ffacbbe9f48237c90d2c189fa977fc8acbf94d278c6f0ad4bcb63f8b3d332f571e0984c SHA512 ee5d478acb2cc32fd012614b6d70d9a2a2f9b666de0f8e5a278be685bcead17b5ab230bcc82c6b33c3f163289e3bdb0818a018721f3fe5d6681179613987e9ab
+DIST PyQt6_sip-13.5.1.tar.gz 111350 BLAKE2B 9e26e88858107d3ca76b4287268ed643fa46c936b41befdf86f7f1fc8f18fdfff42cff8875594a7bf96413b9d5a4a27b3ceb37120fc81d8141394e50b1ed5329 SHA512 1e4170d167a326afe6df86e4a35e209299548054981cb2e5d56da234ef9db4d8594bcb05b6be363c3bc6252776ae9de63d589a3d9f33fba8250d39cdb5e9061a
 EBUILD PyQt6-sip-13.4.1.ebuild 408 BLAKE2B 1571ab43154068fe834999ece31d1fde10b3996f0dc39c86e060cf6d7940fb8c0f883aad58c6a8e173d73cea90ba5ccb0af95ebf22d4ac9d758920fc35e84d38 SHA512 223fea96074f52dcbb3b4d02f481a32c6080d7a80cf521b087be5187ff944da7dc403945c997f9882a68fd57a2482999550cb461c6302361a69f3cb24c5798ba
 EBUILD PyQt6-sip-13.5.0.ebuild 408 BLAKE2B 1571ab43154068fe834999ece31d1fde10b3996f0dc39c86e060cf6d7940fb8c0f883aad58c6a8e173d73cea90ba5ccb0af95ebf22d4ac9d758920fc35e84d38 SHA512 223fea96074f52dcbb3b4d02f481a32c6080d7a80cf521b087be5187ff944da7dc403945c997f9882a68fd57a2482999550cb461c6302361a69f3cb24c5798ba
+EBUILD PyQt6-sip-13.5.1.ebuild 408 BLAKE2B 1571ab43154068fe834999ece31d1fde10b3996f0dc39c86e060cf6d7940fb8c0f883aad58c6a8e173d73cea90ba5ccb0af95ebf22d4ac9d758920fc35e84d38 SHA512 223fea96074f52dcbb3b4d02f481a32c6080d7a80cf521b087be5187ff944da7dc403945c997f9882a68fd57a2482999550cb461c6302361a69f3cb24c5798ba
 MISC metadata.xml 397 BLAKE2B e634d1d335e66f1999898912570f465e7f4e79f7e8aa60b9ad5e8038078ae65c93db31af3e25a7b879941b97704b81efe7e4ab8a698f710eecca914af733f4e7 SHA512 56fa4d44568faf5818bf66b2fef7c2e7cb5010de8c57c21c3c4c8550ab9da671af5afe71e83890e7432c73e5c299b46b6abf2fedbb519f408c21d395900fa490
diff --git a/dev-python/PyQt6-sip/PyQt6-sip-13.5.1.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.5.1.ebuild
new file mode 100644
index 000000000000..26477c15c095
--- /dev/null
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/_}
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="sip module support for PyQt6"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index c29ce7d4fca4..96e1d72364b5 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt6-6.4.2.tar.gz 1025595 BLAKE2B c39f94b934794c40efbda39fb5ccffab81cadcdbeaa5bcc6eff0ca4317576a2d251fd8e9f65de73026e927f547c35ff6cdac0d436d777537622cc6d35a92c112 SHA512 51e5f0d028ee7984876da1653cb135d61e2c402f18b939a92477888cc7c86d3bc2889477403dee6b3d9f66519ee3236d344323493b4c2c2e658e1637b10e53bf
 DIST PyQt6-6.5.0.tar.gz 1033399 BLAKE2B a22ad07813c50d6b626b95aa168996ab51f9714fbf3bf3d6e41a233ec2edb8c8e2cb7edcf3b036bc4f69f0a8f1e6549cde512562a420c0809f84a0e04cfb9368 SHA512 c73d4c253245d2ccc776544bc651d47ea67067f57b49c3f820100701af4d79385ef4cabe9f65098f35daeba5f2921a566606be4f237e567f6f56360cc760f548
-EBUILD PyQt6-6.4.2.ebuild 4475 BLAKE2B baeeb8fc87df86db601b41794910c00bd835166276859114e44325c962ab02b95e3eacee15bf7982dc44fadf2949c54a1b97c04320cc7b36b6eeb3ebea9df335 SHA512 2025c55a0de4124518ff7951cae10dd95593020cb4c845aa8f1f8cd2b39d4fdd729af03ddbbb47819cb208230b5a3a9eb3a5809d391d87fdef7c49dadf1aa36e
-EBUILD PyQt6-6.5.0.ebuild 4567 BLAKE2B 04d166da32ee04c23086377f6867ebef973201d2685ee574426a88423a7eeaf6906527ef04b0da94f397d1b7997cb3841043718733c0b06c3dd2f43408a28e92 SHA512 44c0754a1f8891cab6f4ca52c7f33665ece0f21f6b912e1f025642532a1c598cbe18e7b674f5c47bbb0f82612eb62749a7f124f8e89d40743357e23396172202
+EBUILD PyQt6-6.4.2.ebuild 4573 BLAKE2B fc99566ff231a5471c2b9289b92e47307237627d0492d5399830380748ff1871e6a95ebce0408b0b301b081361fe721d7bd1af5749019d32d12d4e1592fa4dcc SHA512 b41a5dd1a5bf744d34b6a8ee1f8081fabb0da124f399f7c31747a3cb5335b3c1c24288505e60f6f84ba4cc2f7310192be6bb6f7e61426b30e7e44b404c2886af
+EBUILD PyQt6-6.5.0.ebuild 4665 BLAKE2B ccb6f5e1464500413499ff5edef72f3b8017bd0bc4293c7c7af57bfa831bc23df40ac2d9a7e57788e68a8687294369a05cfe5d1bcd6d91af628e2e99cb049f01 SHA512 b22e0986ba43edc6bcb639605ca9e9dd784fb62c5307113bd929303a8ead9b34347fea95cbfd679ee187dc738fddb8ee89aa68dcd121da5e9126d7c61cbdc687
 MISC metadata.xml 1995 BLAKE2B 8fda7f9c4a21ad6264b77b4bb9dc76698082e3272647911c7a0afa138c48cde16d18c9d282caa49ce3ffa36b211c51e865af87fc9caf739de106fb3cb6ff6896 SHA512 2ab635404dd6b1be94cad9c5ee424939ded0f26a7415dc766d823ad5b0ede1beae09a90bb519ba82e0b2ffb638c5abc7841c4d1f0c7481a112cef5a56fc96e84
diff --git a/dev-python/PyQt6/PyQt6-6.4.2.ebuild b/dev-python/PyQt6/PyQt6-6.4.2.ebuild
index a330813b3bbe..d1f60a1efb1b 100644
--- a/dev-python/PyQt6/PyQt6-6.4.2.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.4.2.ebuild
@@ -49,6 +49,7 @@ DEPEND="
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( gles2-only? ( media-libs/libglvnd ) )
 	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
 	qml? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
@@ -135,6 +136,7 @@ src_configure() {
 		$(usev !qml --no-qml-plugin)
 
 		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !opengl --disabled-feature=PyQt_OpenGL)
 		$(usev !ssl --disabled-feature=PyQt_SSL)
 	)
 }
diff --git a/dev-python/PyQt6/PyQt6-6.5.0.ebuild b/dev-python/PyQt6/PyQt6-6.5.0.ebuild
index cc79a2b35f27..3490224e1178 100644
--- a/dev-python/PyQt6/PyQt6-6.5.0.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.5.0.ebuild
@@ -50,6 +50,7 @@ DEPEND="
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
 	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
+	opengl? ( gles2-only? ( media-libs/libglvnd ) )
 	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
 	qml? ( >=dev-qt/qtdeclarative-${QT_PV} )
 	quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
@@ -137,6 +138,7 @@ src_configure() {
 		$(usev !qml --no-qml-plugin)
 
 		$(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
+		$(usev !opengl --disabled-feature=PyQt_OpenGL)
 		$(usev !ssl --disabled-feature=PyQt_SSL)
 	)
 }
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 54ae9f6fb098..c1d5ca603e4b 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,7 +1,9 @@
 DIST serverless-application-model-1.62.0.gh.tar.gz 5177544 BLAKE2B ad0fdca32821e9b5dab86d03e65ad1a458493ecba0e75f6b2dc8b9978a6085ae5269496e231a2f09cd228e6bd2a66b3803953d2ca5aa7c265fa1019305aa1a9c SHA512 42f1d3ff352a02ab73f5a16cfeb800a80852986b09f71d9468b23c22b8dafff3a20e8ac92956020280884e4318bd80369b5b04ea6e9f0a28067dd792f1623747
 DIST serverless-application-model-1.63.0.gh.tar.gz 5213667 BLAKE2B b75315d1c28789e9f0b8aa4774292ff2531806c1d59a8c16ab683fee439d188025c9cc62c2de037f2d947ad3b7eaa8bb4fbe8a5507ef1a4f3619f758cdf2eadc SHA512 eb6dc0f545550f726b59a2ea1994f8dfcc8eaf7a1fbca6ab12bfbe891813b208d869e25c0b320411aa6476dcf8c86fb19db9e13ddf0419d90d3c3403bd57485c
 DIST serverless-application-model-1.64.0.gh.tar.gz 5231257 BLAKE2B 53eeb37d69ae0f133b936eb8bb20005ecdad5d71956becd61a9e9080be9bead1bebe98b89d0f67604ac74731b2ac7061f74fae67f0c8e12bf10f7a9dfc40eb3e SHA512 9584657026ca7c260fb9851e8669b19c896a88a4455c6e50e734c1d9b375b69d5cf85b64f960fa0987e8a34823343de3e8c8080413da07fcfb69dc491e72c761
+DIST serverless-application-model-1.65.0.gh.tar.gz 5310251 BLAKE2B 41d4b2a8902dc1bbd2b01f534475005b2c288d33d5bc76049af8b034d428f40b063de71830e4ea3552ab00b7b437e197cf561982d28d74f9762b175a956d587b SHA512 d4a7475f955145e9d141b1d3795bef5e1eb1c330e07b01e5f0e6207f33b73622dcce4ab9bbf10413513321f64e09d59f61aaf01d9fe9f0760b9b31d10c6e3d68
 EBUILD aws-sam-translator-1.62.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
 EBUILD aws-sam-translator-1.63.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 EBUILD aws-sam-translator-1.64.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.65.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
new file mode 100644
index 000000000000..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 8ac48abd07fa..40cfc5cf38db 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,3 +1,5 @@
 DIST awx-22.0.0.gh.tar.gz 16988159 BLAKE2B 88b2e8a1f035ca34c7dfd6ddb83ca9b72824153611861286c771a0493bf6c9fefa593d9e92116e9adf1968ee39c128af318fb7d5ef542e1d4603e235a7471412 SHA512 5ce0ea43d758e63ace024cee1c67e19a154104508dea2b67bdb275189e1f993b3b0c782e704d319196dcaabcf09db12ff36fcf73a35e5c4fdd5076a7e0649e10
+DIST awx-22.1.0.gh.tar.gz 16995197 BLAKE2B 4a455219a7be93c5e85fafb2108162ef6745d835a18ad6ff842fda3e82c51e789d6a512a51275a8c169a7a480e242b2043400c641e7c950a84138cab41560758 SHA512 8a1bea58d24f6240d713d95a0389e434c242efda2e8eea10b3c9baa49174e93861558e4d80983aadc3d762f5b7f8c71f7440c057e1f00d4ac33619a68ab4a51a
 EBUILD awxkit-22.0.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
+EBUILD awxkit-22.1.0.ebuild 1120 BLAKE2B 46ec711a264814630cb4147d859992a8c5ccd5d13d6d43f655af2643e7ea9865281d0f9abede93bb66aa585c9025a5809a55fac4d0bf0c2604e47961628c6bfc SHA512 11ba01f282a7f6e5b64a9f1adcfc3c7913c6a2a409965607e312fa9d7fe401ca9d0b5b099ae8a5b2bd91c19d4c06db0a9f744d3b7e44ba73b14bd056e7eed90d
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-22.1.0.ebuild b/dev-python/awxkit/awxkit-22.1.0.ebuild
new file mode 100644
index 000000000000..d080ce8c4341
--- /dev/null
+++ b/dev-python/awxkit/awxkit-22.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+# no sdist, as of 22.0.0
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a91cbd07c36f..88306f517a1e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,11 +4,13 @@ DIST boto3-1.26.112.gh.tar.gz 636498 BLAKE2B 2768bdc1fec35eca4a3079bf12933fc2832
 DIST boto3-1.26.113.gh.tar.gz 636722 BLAKE2B 0b5c3819c004ba425294208f114b4b11713730a18e45cf274b8bfe1f762f59e2c404e0a4ccbbec16be934931e7b37c2bd462b7df7d6d47275b1de26300de216e SHA512 bafda63eddb19b97538224e9c12bc3178a0999cc4d2547cb7ec7335f28a7fe3875130573d4fab2fe21000cc1e3bc4e3a7a5ae99bc8f0e9dc7e2b40ad6fb5a2e0
 DIST boto3-1.26.114.gh.tar.gz 637000 BLAKE2B 06f74ac214f4c2161ebe464e1c8fc42c74cb4429110c8ce979db3962fde5240c62ac94b4b9ca002fff89a36659a8830265ac693bd9522082b8cae21108e16cf9 SHA512 324ea177c8ee98a0935d1935f08b31f1640eedf8a7dd19f2bc958f6c1c2fb9deea29f0482b1f4c903d70860a93274dd0d70eafe0564116361daf5e7df51abd26
 DIST boto3-1.26.115.gh.tar.gz 637877 BLAKE2B 861cf3a197002bcfac3f1ca3428bd01f1a8e103462e0de83ed33bb7575de0056f4222195c70dcd0e40dcf3744467e8c017bfe361e589eaf641fec76d6d3eea94 SHA512 337e90d91bb9efcff89b410d5222dead7ce1d0f35257bebe0309cd5fa657facd1a0352bee0ea23d3b94ad852da03a182b7dabf4c2d854390fd227bd58fabc6d3
+DIST boto3-1.26.116.gh.tar.gz 638605 BLAKE2B 946634bfaa4f0b4bd3689a11d8dc3e982dd8166c2b4409335bd1be58c356bbcbf2e5d22c7f319d29a549c69d4a14a3d2afb369c345c643cfa369fb3c9843e04f SHA512 2434fbf7ef2434365863ae8c67c16209a6537afb21697e24efd466146f6fe03566bec220943392139231d55aa570ba3d696a086fc087e4f9d1908da96794c77a
 EBUILD boto3-1.26.104.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-1.26.109.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.112.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.113.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.114.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.115.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.116.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.116.ebuild b/dev-python/boto3/boto3-1.26.116.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.116.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index fdb670e0cea0..28df11c378ed 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,11 +4,13 @@ DIST botocore-1.29.112.gh.tar.gz 11380151 BLAKE2B 0392abe4e6be29a9e3eae1e693d7cc
 DIST botocore-1.29.113.gh.tar.gz 11386284 BLAKE2B a3611f356f25080f00f675b20a8b49952bcf1e464b9a114bf37392ebdf4573ac1e9eb6373c61dbf87f8101e055f4f6600f7825f45b00c5723c1528d74865dd6c SHA512 8a16fdde7099ae75a3587ee0c0108c12a6c5c27dbbbfc2d98eb3ccd4c66b45f0389a722f1b10ac3f3cc69ea7ba9135cc0604e35126cc2691a26f4a6173d5258a
 DIST botocore-1.29.114.gh.tar.gz 11388772 BLAKE2B 6c9ce892cccf2f85ba4bcd49b31309528016313bb699efbca3b00d3cf3797de5e1b35bd71a3b5bd6d471e9c411ad7750ebd25c03571aa18c34cd42bc2f47bc19 SHA512 6633a2aaf2865a89976ba4097fa64cee4167a9144d4eadc7d9be711e65735bab08d2c03c18ae52c4901fea47265301cb95c91306b261fb48b4119bec66cde376
 DIST botocore-1.29.115.gh.tar.gz 11394187 BLAKE2B 621be4a22b7f06d520bcd630ed6e1a8721d11d5c7822f56f54907177d0773b69247b627a42cfbb1b8e053f54ea16f7238acc0d485379c1e071b6e917ea625596 SHA512 525d8f219cad541c4cc125c2d5eeb7595fba6192bda23e7bcc02a65e4ec413756ae3d8ab5bcb3185b5c837bc7214c22146e52716ff010cc396bc8d32cd98b956
+DIST botocore-1.29.116.gh.tar.gz 11399292 BLAKE2B 47a53b2612804911465f6f56a78f79e389ac7bd2e29e3f45c60f25ec1e700df8956dac034d058974bb453623d5ed5edc416d07b45427cb1ef3c584b5ec4b97f3 SHA512 81636c104a0c4b4f04ebeb066171be206929d5eaf2c40e6f383e701a9dc917f84d4b2f9ef2d7a26b278960af7561316d289be4150eede9a56be20dbf606aa57c
 EBUILD botocore-1.29.104.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-1.29.109.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.112.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.113.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.114.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.115.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.116.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.116.ebuild b/dev-python/botocore/botocore-1.29.116.ebuild
new file mode 100644
index 000000000000..491b6bbc21f2
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.116.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/browser-cookie3/Manifest b/dev-python/browser-cookie3/Manifest
index 97c1de06f64a..96a05bf2e7dc 100644
--- a/dev-python/browser-cookie3/Manifest
+++ b/dev-python/browser-cookie3/Manifest
@@ -1,3 +1,5 @@
 DIST browser-cookie3-0.17.1.tar.gz 15882 BLAKE2B 76dbe885a21bc904eb53a2c9360f998d6b5d63b06b8025330d8960e07b630f13946f543a48cd9f3a24498e857e6245171fd7805bc403bae437caebd7209519bf SHA512 cf677a6cb8db32144dbced235fcd581743d997bcac77fe89a0d7c0b6400ff92d078cd04159f7819a8358128155cd105d44d4cde06cb345514e43d33dba931240
+DIST browser-cookie3-0.18.0.tar.gz 15607 BLAKE2B 51d815d2231331e48681dcb90f4499f2b701c8a1058e83d7591465e6cfbcdc9a6b9f6bcd569eca7b3468541cea12b02840fceacaba4545ea0f704dcfc054c755 SHA512 7686fc7c943a09f039e42454ccd184cd0540ece1095469149c363f907f3f50f232b6a5f1a2a14f923963d5b46320293ad42b3bdd1089e26b1a17f52960f4f7de
 EBUILD browser-cookie3-0.17.1.ebuild 764 BLAKE2B 3719e453a4535c6b42d518b26ebe109c03a88925af1a3c5647076776be8ab81ac75189d411e61f083b08cb0f922f6f911f732e615455ac0951e67037fda74782 SHA512 83f5a6cdc5d72cc47c8c66d63219ebd659562154f465b7459126a3df6861dc8cb02d087b7486f5edc0c97ff04fc89e919f5bd967ebcbcc3418a08804facf6c13
+EBUILD browser-cookie3-0.18.0.ebuild 784 BLAKE2B b155aaf7466e97e4347aba6a71d219a86ca6aa1243352f8be5d20cb88e51f8c75edb4b8ae8b91af60fd4dd9568e1b90c0bb1ea5ea9fa974955f91072649dd1e8 SHA512 2f4bbd3b6aab7891494584c9a2a9373b36fdc2c6584f285388256d4fa63bb29ea0ae6a36f338823b8e1e25d2b5e12e7f9034259d93231bd020e9dc9ae2e0a09f
 MISC metadata.xml 516 BLAKE2B cec8305c1ded26acbcbf08fa45b6247b05d20a20ea3c9463066b9a442bd8513489d51ee61325620e75e1e0b30a27c785506382285c9533d4bfb7f23344a5c297 SHA512 52157186448dcbe5d4644c518f6b8a3ebf602e0fe4ad700cc20dcac920c02f1dd2acc86ba24a63029d9a5952f025c7d5eef79821de726b42e849cd41e1155737
diff --git a/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild b/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild
new file mode 100644
index 000000000000..5d5225ac0edd
--- /dev/null
+++ b/dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Loads cookies from your browser into a cookiejar object"
+HOMEPAGE="
+	https://github.com/borisbabic/browser_cookie3/
+	https://pypi.org/project/browser-cookie3/
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/lz4[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# make cryptodome-friendly
+	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
+	sed -i -e 's:Cryptodome:Crypto:g' __init__.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index d3541f511a58..76672693c9f4 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -4,10 +4,12 @@ DIST cfn-lint-0.76.1.gh.tar.gz 3631194 BLAKE2B 95d395369fc230fe4e6c5d5e2a0e4bf24
 DIST cfn-lint-0.76.2.tar.gz 3402554 BLAKE2B e5f9405d2852e3b81140a24d94c90a3bf8c919eb6823280a0a887c6acc56ec71d991cbc76532cc49d1189a8f64750ba3e9db02fb3b46b27a28ec3468f4dd268e SHA512 96351ade16308be18baace1351e263a179eacc0b3635e9baa959baadaebb6a08825f6cb9cd83cb83b8635785c7f54405bfcf00f85d6d95d101d3298919cd1ea7
 DIST cfn-lint-0.77.0.tar.gz 3474124 BLAKE2B 5715618f6b44a7a88ef3af8d21d038fa4ce4707973e64eb9712ff524cd5276e71802ad4b9a55580ac469b6474c7d48a8ccee04660bcaf7934df7a23cab1e5a9a SHA512 6509197ef29d8bcbfc416df0a63f89736f704b147bbeb489586b6a06e1818f1d91e59429c73a9e9e23dadb20325a3c79d0b8e1b4637cd0e131f9673422e36734
 DIST cfn-lint-0.77.1.tar.gz 3483399 BLAKE2B 6eaaba9cf70044c673164bce3a062b00ae7703b091e2c0e8d5065e815278fdb88d75f2592695cd1be1612421f95c806f6eaf3be9f4725abec0cf5e39070ff175 SHA512 0d18e7bc19d5562c88194f834267fa6d2fd8125754399ef281598beb68752e7935a653fbe3a0573f4887cb7a76c41b49ad8e268d390db59dd79794cde4939f31
+DIST cfn-lint-0.77.2.tar.gz 3483728 BLAKE2B f7c3cb5be3fbc81f10515bec145030c21c9a754ecbb887267ee85ea9fecd41e57be8572d30f204a54c3e22191c58d2c7d7112115e2c6cd0a23490c4c7633d270 SHA512 8e901564b34e601e62a276b8f8a4b5687de651aafa6da6dc295e846b04e703bda24e6a72b71797c82d2c2f4c93978da92a08999cb73be6a48c9ffd4a40ccb0e6
 EBUILD cfn-lint-0.74.3.ebuild 1623 BLAKE2B 07a514b96d3f3b0084e82698f7c50c57d7c592573c964aa5cad35681347b31035bac3ba580764b5538bf71b35622fd697e782162fb4796cb60afb69d8f3bf11f SHA512 5b8ae5749d2bcf6faa296cb046185888b6e42213341d990839a3de496b0cd3dce699a0a7fd318537b9405a5a6b7a2104ea7b40adfbdf1f4f63721a28e32a5988
 EBUILD cfn-lint-0.75.1.ebuild 1625 BLAKE2B 22541f210143e50b731ad2234f300f8175a3626288cb0d8358e6d690d81a56eac4c34521c5ea0468e6fef9a95e4c0bbbba1d8792c1e8490c4b787413730088e7 SHA512 4a2d0db8bc62e0041ee27fc776e3a75e7839333ff3c58affd65128a45e615ba2037d8b819972d584f67afcd18a5b85f2c4ff8c46b32676b6db70c81f6cd347ef
 EBUILD cfn-lint-0.76.1.ebuild 2157 BLAKE2B 57d16cabb2460f7161933f9ca3814baccad5e3c0ebedc0332e07574db35c4432a916415fba17e063da1d71f09436663450b0ab42d19eefcf16c7b24f940fe71f SHA512 511eecc772689a9e13a80070c96670ac0b45bc207ca90b228e8b0acd36c73cc9df7a33ff4714512f59e0221e36be9ba3099c1711402bc39eacd5e0a7415d7b92
 EBUILD cfn-lint-0.76.2.ebuild 1977 BLAKE2B eb75179972626397fd5d225f0f228a69eee61257c23bc63685a96e495183b733ec146fad85ca4e821fe6f1cfbe55b079329a4d52fb83f0391f74cd124a6637f2 SHA512 656b2acf67cb7944a727297cd6df99cc9640177304661b9626d075499b50d60b7941ac3473430cc2f9fda1b19b693a056d52da6198b2b73e4eac634070a794da
 EBUILD cfn-lint-0.77.0.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
 EBUILD cfn-lint-0.77.1.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
+EBUILD cfn-lint-0.77.2.ebuild 2013 BLAKE2B e685a47e788380adf32a251c55c6fbe770afbc84b493da3accec08e3227435425c424cabe0f46c9e7660829bc6cd6ee8408eeb4df64a143312a3b244e21a5b41 SHA512 0d6a0021003a3f905f1d31545ad66438d4540f3ad4bad8b094c8bb1fcc4d125266fdf12d6a67fae2281dcf7886e003295697c081240617b714f014f1e2e995e1
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild b/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
new file mode 100644
index 000000000000..2b6753f1c840
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.64.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index fcb034b20a7a..68b0e32bc3dd 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.1.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
-EBUILD clang-python-16.0.2.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
+EBUILD clang-python-16.0.2.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
+EBUILD clang-python-16.0.3.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230325.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230414.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-16.0.2.ebuild b/dev-python/clang-python/clang-python-16.0.2.ebuild
new file mode 100644
index 000000000000..83f4d804e310
--- /dev/null
+++ b/dev-python/clang-python/clang-python-16.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-16.0.2.9999.ebuild b/dev-python/clang-python/clang-python-16.0.3.9999.ebuild
similarity index 100%
rename from dev-python/clang-python/clang-python-16.0.2.9999.ebuild
rename to dev-python/clang-python/clang-python-16.0.3.9999.ebuild
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 95dda8a01ef0..31edf39b5440 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-4.2.0.tar.gz 83168 BLAKE2B ac2d288ac3728f4266d61edb9b6aedc897e9020d3f8a74ebba4721530942a27335564c2a95406a4d6b5374df49e38bc0aa303d3aff12f83c91e48c59f13aa45f SHA512 6f0c31b49603be5289e6d4c9b2572862e977264df21dc14d976289c627909102d672ee8ffa5b6cd79b3a349158ff8f36444a2d2061e18eeb7121ce79b2d5719b
-EBUILD cliff-4.2.0.ebuild 1120 BLAKE2B cc270e274c76f5621069615eb3f00889d8138b0dbc69067371de88fae57b8c5e526d0891c2c5e6d3a2e81edca76952cc7f6959c113957b252dd10972883dac6c SHA512 0fd472d4464740f7b6dfcaf932d386809baf1c8f97a7f6e35b161f7c669e364fe7236c3663a346400919ffa3c1e8b6177d24c8938336ba8a14b7fd43ab9da409
+EBUILD cliff-4.2.0.ebuild 1120 BLAKE2B 2f6e955387b1412415974becd157303b0648c9cf5fdea47e6bfa8830e1e0e515a791586d7a92bbf0ceb1dff39bb761508687361d78f8b50a730a3579787d842f SHA512 0e81f7cfb53119c84e5707714f49f1822c2d42293e23d511aedbe4931edcb743f3983b529e33abe6c2c7974a111774524a69bbb862225ee9dfe82aafd07eb218
 MISC metadata.xml 712 BLAKE2B 367482d2ee04af7b55c217aaa49b5784333f66b1a25dffc0bcf5b639c90d69df0002feac780e36ca7a7c40fd40be424c8116389fbaf9ad5547ffb7f2f5f34697 SHA512 dfcdcdb8f473a5f9caaf281f3c408b21c15dee411c71f45ac0c2f79d2ce2ab5aa29bc59d5fcb1ee13db033509b38c27a3b9d5c07b6bd20a10e9933632f9f5657
diff --git a/dev-python/cliff/cliff-4.2.0.ebuild b/dev-python/cliff/cliff-4.2.0.ebuild
index 05639f5c552a..6ea1b97c76b2 100644
--- a/dev-python/cliff/cliff-4.2.0.ebuild
+++ b/dev-python/cliff/cliff-4.2.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 729deae5dfbe..909744168c79 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,3 @@
 DIST cssutils-2.6.0.tar.gz 723259 BLAKE2B 6548e87c78fe6b850b98989521c27cebd4170939517edca895c2787c1367e1c6dc94308355f7dd2e1dee7194f88bd025b72c801cd9b90f8a08ab244f6a4e890e SHA512 95ce26cc4816e7750fc0f1e0c4ac60f176e3c7b3ea1871440bf937d442e0f8626f9e4c75622c0ea3a84d68ceb4b768544e9642936beb87eff1b55117ce47b311
-EBUILD cssutils-2.6.0.ebuild 1044 BLAKE2B efabb6510e42b0cd1a20cd1ddae38760f74cde5e51e9628e52febe4f4843c8c9316b88576655a213c3bdf43ff946fa263cd629e9c7a6278fd6458634c8cc9e83 SHA512 b18e610b94fd67d898c9cdb71bcf8664699899428b85d55af0a558dc0e259e8fd83ef45733224636ca93258fa0083d0d79abef430e272475c3e8d1300ddf0f81
+EBUILD cssutils-2.6.0.ebuild 1044 BLAKE2B 7c7ecdf16f9b8ec18336b4f2b54dfc8c163fe288161922af7542272d1658ddbe9de0ca7480d3e56d71769bd5ad56d84e8e91332f848b098e6480131839c2a1fb SHA512 85441a0a753be656c8b1cd739e845a0bb124d5bb8f0b33e1f80c6041d0bc12993f11257d60788aa1bf915538320e7d98b574a85af491cd93265397fd265e5308
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.6.0.ebuild b/dev-python/cssutils/cssutils-2.6.0.ebuild
index 2b70df067b6d..8dbaa66b35db 100644
--- a/dev-python/cssutils/cssutils-2.6.0.ebuild
+++ b/dev-python/cssutils/cssutils-2.6.0.ebuild
@@ -26,7 +26,7 @@ BDEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
+			dev-python/importlib-resources[${PYTHON_USEDEP}]
 		' 3.8)
 	)
 "
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 2e2d41fd2f1b..a893f6c1e910 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -2,7 +2,7 @@ AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f7
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
 DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
 DIST cx_Freeze-6.14.9.gh.tar.gz 1649748 BLAKE2B 08fefea6ed9610b672ca8a4a6e480cedf8fd75c967880e74f94c12368ec1ff71a9d34baae02342f7c4484e65beda5dc71dd39e13b8c340c5b7dd2e89b38ba0f1 SHA512 bfe3e5d3dcf96cff448b034a779b93c37dacda489ee4eabd92e8f4708c6d7a9fe2430bc512f40c6af8c6f851fff24a3626b80f10295af1357e4a58563474e8eb
-EBUILD cx_Freeze-6.13.1.ebuild 1272 BLAKE2B 6b2ce59c6370847e2b50518f67a3806957b9961ecdd94af4f09ac6240c3479654e4703e7f1fa92390581eb72a773602cf8ecadcc0b4be888efc76195d2a6e349 SHA512 1d7a8e3d92025a61ee5ce4628031da121fcfec17364f2b936310ac6516c49e6af7274279bfa9965fbef2a1c2749d9fdc5ede82317ad79c85824181218706f107
-EBUILD cx_Freeze-6.14.5.ebuild 1346 BLAKE2B 86822dd6c6058fdd6b3d3a2e0630587e25025b9a80e811a7cf6c06e60cfc062ff74b6ab5b3a9291b6b376b5d6596241b4ec6eab8d4b25c5c9bd0b37fd7de22c2 SHA512 3f2013739975defaa20a48fd79ab0a77742732e526bfe08a039e98ee9cb09cd6d2ad47f825f9b7a966e8b22e6edd90ce09554023e183549eec706fbaf934a7dc
-EBUILD cx_Freeze-6.14.9.ebuild 1395 BLAKE2B ceb36383b463a124dedbd92346124a20f82e71863381d9fc193db3c80b24496613c2eeb5d1360527418468e5c7f2572b317a7b81b2527cd2e485037668f6443a SHA512 167f1e01624f3826e95589bcf4b5eeeee089b11d14b44423f6e78a59f18b4ef51174d6054d6d64551317a6c76256ee499b9cd52e2ed9d3484bddc77e42e4093f
+EBUILD cx_Freeze-6.13.1.ebuild 1272 BLAKE2B 295929fca682e28c3d72ab7028d72f6f8eaf3facfdf1fc3e426fe78812387109c1f376b5ae957fcad8f92fb206b6347535bd5c1496db323c76965e911c122d32 SHA512 14eb68d68ac720b15bc343a1b2eee05c90b1c2f503f75aee99d8c83e67253509d2b60ddc3bdc610804e4411c022f7f3b5509f51d87c8ecb7f2c3d69c9384a825
+EBUILD cx_Freeze-6.14.5.ebuild 1346 BLAKE2B c86e2242b4e86b61eeaeec0c05744ae3dc584118a0e1409545173f0e4bba9cb6714e240a194bef7afa338ba766f37b70c66c36d0f23229964f0e96bba46bac95 SHA512 accebcc2bd77a498a6d32d9d3f94f5bcb08a0f637d18225adb738275df1d5b3319e6ead825e6882f7932838542566ca20e31b4acab5f0fe78c25e284a09229a2
+EBUILD cx_Freeze-6.14.9.ebuild 1395 BLAKE2B f91b34c6f17dfdfa309dba3ab5c746e4fd4b3ca92907630de5437761863ac11c261dee0868369fb6f3c9b4d20f009e22f9f77400bf0ccc7d24c5461613e27310 SHA512 7aa156d1b4b8cdfbaf7245243b8b4ce3f38b957d8952a2c22249db420b93ff823fa4f5c77d83b403d8400c9c238cc7eaff69352bef0e88eb4c5841a4f9818d71
 MISC metadata.xml 377 BLAKE2B 86f050a41d2f189365feead986749e6173cb4e7b7bec9bbc16cf12bff93dcfb900b1023878dfaa3962673e949802562354f11469dc7db29821c5175db359bacc SHA512 eb2c5a7911f2760a224eeb3ce665406d4ef0f04502c3b077e9e59ec814bfc4e5dffdf41cca12b160d4c50c53434da2bf4385863318034262a4c5a11d9ef620a2
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
index cd758fbb0d2e..e2dc4187683f 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	dev-util/patchelf
 	virtual/libcrypt:=
 	$(python_gen_cond_dep '
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
index 5d0805d10922..95857e29f869 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	dev-util/patchelf
 	virtual/libcrypt:=
 	$(python_gen_cond_dep '
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
index 0c7a33ecf5bd..1fa9e1750347 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.9)
 	dev-util/patchelf
 	virtual/libcrypt:=
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 0bfacd9d6bdc..68ae0769df03 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,5 @@
 DIST dask-2023.3.2.gh.tar.gz 8525841 BLAKE2B 660f3687320c0d56abe437bf7edea2f40fe624a3f48761238b00756f61358d73d47a570399ed70f6f1f2188cb03b04fc10e5c9683e2a49c6b73a21c35173e1dc SHA512 ef1a961a50e69a32aea14630e9d19fc92646e9f520fa265937bb923aeba5932397840b2971bfb9a47125672ac2bd9b0b6a017b650708a183b3bf6c0c345e2af2
 DIST dask-2023.4.0.gh.tar.gz 8511473 BLAKE2B 3b6a4e07e0ddc1a40b9494089250e80254b16002c18b091911aa007e1e455f146a192e5f8f9c49b5cf73bc60d942429e1d5ff399516f2b81120ae8f4d79b1dbb SHA512 40071fc3f5597312af28a5c545ebb14d2e2aa3d1a3a0a5d81d335fce3a7a8e7036c900a1caa43f84f76335c469b1bf138f662588f0d015943c4a4bf931c20349
-EBUILD dask-2023.3.2.ebuild 2114 BLAKE2B c52b94bc58da75e58206d096afd0209c732b5a370521f82b4dbc325250533cff8a0f2e5cdd8620256260214d7e7059baf1c6f899990d2a222ad4215fb06fcac4 SHA512 496e8528c4a01f81752ccd8d65ac5042960c96dc22ff095f9d36a35fa815f2823decd8bcb813370ed5cde1aa34eefe58ab282945e5d12a6d5157114d647623e3
-EBUILD dask-2023.4.0.ebuild 2210 BLAKE2B afc7de3e8286fa121dc3e7fa98940bcb6b27dc37ac2d3350e2d591aa14b1f0dc70fcec3565203dd8075d1d4c18deee8ea5a92d6d244a62feb8e293ffd30d8ea7 SHA512 e8a79ff4cec90abdf73abc827a65f42432696efd8907ac6627132734ce3a83b36c57eba1e8f483e8db7c59571198bec0aa6bb83ea88de960163261ce300b14b9
+EBUILD dask-2023.3.2.ebuild 2114 BLAKE2B 0eb051821a2de52ec53806bcbbc58b6ffa0dc41cdca6047d7192f5a2deec78f0d05dce895dc50faba89bf1d60df2c9c3d1d9985794953b339edfffe7e2c2fe1c SHA512 c11268c3ed784133b2ad4ac01d2f396fe6e3895dbf822200400119b01f892371d116f50242ea890035148f80abff36d0d0dd73fd7e16c6939d2a1aa3e7853a85
+EBUILD dask-2023.4.0.ebuild 2210 BLAKE2B 1e5d7d7d40ee193b7a880426351bd7775145b98b52d1be54add8de36b4306ff0c82bc5ca5e5da551e7d31784a92dfe783343c3c14cdcf6e90b17332af516570a SHA512 aaf9967b121ff8649535283494a67ed5a08de1faea47aa86d1fec1299a54f3a74dd7dcab5bf25d5ffd583892784d9b491c5624ba4ea5306e21464219582b868a
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.3.2.ebuild b/dev-python/dask/dask-2023.3.2.ebuild
index abe01ee1aee3..7ddc06075f6a 100644
--- a/dev-python/dask/dask-2023.3.2.ebuild
+++ b/dev-python/dask/dask-2023.3.2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
 	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dask/dask-2023.4.0.ebuild b/dev-python/dask/dask-2023.4.0.ebuild
index 3176aad61c51..e6a446e10f3b 100644
--- a/dev-python/dask/dask-2023.4.0.ebuild
+++ b/dev-python/dask/dask-2023.4.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/cloudpickle-1.1.1[${PYTHON_USEDEP}]
 	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
 	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index b525eb62a828..59f157d4a6de 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,7 @@
 DIST diskcache-5.4.0.gh.tar.gz 653968 BLAKE2B 765f0d8d9c4b3a8bf9e4c52b3b931867dc0b92aa7b891d6d64cbfe9e7ff491662a1fa2f0af776f9b3dcc4b441f50b68dc009a29e9b0d37f99add9033f4fb94d8 SHA512 cc15ff0b06b2a5708692f50e185699bd53e60408cef25053bcb5aaffec2795dd53c3bfe4b131a47f68c43388927ecc034c43233c38494cb2f6e40636344270fc
 DIST diskcache-5.5.1.gh.tar.gz 654928 BLAKE2B ba042de4d02b8d1556b56efbcbb5b5f0de861e61f7dff33c5b65c6c7bbd362e72a18293bfcd146faf4a83f6ac31443bae5cf4de80910a9cd49f63149ab93b5f4 SHA512 f9cfa8bcabc36bcc0d36c8c6912756abb7eb2f40b8cfb2b49302a2bf7287e52a16885768aafb74a0517777d460ed03a16c8af2465b4c7ae56175a6a7462b5fcd
+DIST diskcache-5.6.1.gh.tar.gz 655959 BLAKE2B 95ba66a8c701796eec1bedcbb514e9288789d52887401f0687374f43c3bd31a502c7e0e0a1fe4b9df05c41a5a1e4efcda8986840749c170295544787e6fd7112 SHA512 a0a6847121089ffe727ec30bd94716d6ab78e5abd4cc8a3230c6ef034b27776be76ca223c3060af3150d2fceadcda670cbf7851c0f47624264342429b29b4f5d
 EBUILD diskcache-5.4.0-r1.ebuild 930 BLAKE2B 7abe674e6186c378049877a291d820c5db40b8b109fead89112316d0638ed8649b28b8fb014550e5e1297e2aa5450397869aa69a4a642155f9161b789491b0c8 SHA512 c133e18a0dc645543e14116abf0f961dc7276b56d21a49d990912abb008c827a911a7c4816d8c58f2eacb02abed399bdbd949ebe270240fa770fb2a61363216e
 EBUILD diskcache-5.5.1.ebuild 971 BLAKE2B ec18f4c5ce08ccc6b75fedb73da2abf4293e4e1bf3082af42b8b0ce155063968f54a84bf4d1ea9608d2e97933e36bda82bd2b0aff4a7b45fd0ec822cd2262d37 SHA512 a9ee0eece4eed3b617b2b0b7979fa47ccb0d0396e8989f13b6c8ffb647c5a320ab6b7a8db53d74e1cfad5f125bfe0e4ac4cff0a19012d86c881e815664075aa5
+EBUILD diskcache-5.6.1.ebuild 971 BLAKE2B ec18f4c5ce08ccc6b75fedb73da2abf4293e4e1bf3082af42b8b0ce155063968f54a84bf4d1ea9608d2e97933e36bda82bd2b0aff4a7b45fd0ec822cd2262d37 SHA512 a9ee0eece4eed3b617b2b0b7979fa47ccb0d0396e8989f13b6c8ffb647c5a320ab6b7a8db53d74e1cfad5f125bfe0e4ac4cff0a19012d86c881e815664075aa5
 MISC metadata.xml 417 BLAKE2B ea6f6d25bf863d8be1af817e00d06d668672ddb5cdd938f0bb1a0e92712bdf116540c36014778a160be6ec6144db406f1a1f0d804c3218e38b8bbfc7c1456cc9 SHA512 c5812352980d74ddadbe2192c2c724369ae37d2d0c3d6018220d2ab0bf07559e569af816f3503b8db825a7689cca7a340adc4bd3d1bd73893446a41a7bfb6882
diff --git a/dev-python/diskcache/diskcache-5.6.1.ebuild b/dev-python/diskcache/diskcache-5.6.1.ebuild
new file mode 100644
index 000000000000..cb99ca88f78c
--- /dev/null
+++ b/dev-python/diskcache/diskcache-5.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://grantjenks.com/docs/diskcache/
+	https://github.com/grantjenks/python-diskcache/
+	https://pypi.org/project/diskcache/
+"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="
+	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/python-diskcache-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		>=dev-python/django-3.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove dep on pytest-xdist and pytest-cov
+	sed -i -e '/-n auto/d' -e '/--cov/d' tox.ini || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index a237b289d5d3..a59764b42e45 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,3 +1,3 @@
 DIST dns-lexicon-3.11.7.gh.tar.gz 6677647 BLAKE2B 9330bcc81e053e9cf8b2171b444e5d20e86922da15df7121a5957f8e6932528ba1f9099cc4dff08b2825d8fa253369b8b2da026a0846e64896bf491c59f2bdc9 SHA512 7d3becea6b9d60a4589e9d7e8de010d0b7e6a2c127d1ccc6981d1bff88d09f5a708fd3e9e22f66b8a0a77a331784340662de73607dd25d69c0342795c6afc765
-EBUILD dns-lexicon-3.11.7.ebuild 1783 BLAKE2B 9a3c6b97e9efceab0c0f5d97087fa1838489de5a6bdba515f57113eb29c93dbc7b24471b193b6b0d42389e2d6fa11375edca0e38fc3d1b80888a27f09f60d545 SHA512 ddc1e54fc46bec409c2c30c14493cfd82ed0c18062c58913c5d130830b64078b1283b7528d64b357e880a4daefb0c6e4bbc74bc716bbb52f2c5b5b75677d5790
+EBUILD dns-lexicon-3.11.7.ebuild 1783 BLAKE2B 04bc277d951a7d41b88b854e908bbe4f6465bc040bd60365220f673ba6b39f2d04f08530a0d3b79e98fc2b0b30118a5553e41780d5a7a255bcafbfdf7015c5be SHA512 a05126ada90a7f595a0aa153c596c1ec740e072908b9b34333beebb1a554fb445a1a3c6b9a4247e8e6dbfe2fdcd9752761cc17e5425b311a2a5ed233c68b0d0c
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
index 3ea8911b102b..61b3bb1da894 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 59b99994fc80..ea4931807cb8 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,11 +1,13 @@
 DIST filelock-3.10.6.tar.gz 10478 BLAKE2B dfb9fdc81da83b99833d5412a09ac697ee2488815672f12d798a88c7211d1d9cfe7a7300f35ce2ae6fa018784b0227a79c9ed4a3f96c881c117a6fe3b9d6c03f SHA512 82b962ee2d22788d272f6149bef3587fa2213cce4fad1c843911fcb28f1bbb529c93e09ad854a5abff5dabea0375bd9b797be4dc141b8633f590954c257173b3
 DIST filelock-3.10.7.tar.gz 10481 BLAKE2B f47f79c829154d24b12489e1ef25f500fbc49fd773de1170af168a49fbad7bfcedd89ca9dc151e6705ed0cae10c009293a175b8bded19fc69255faef7823a9ad SHA512 4ccdc6bc7d731b3854773bcc9cba47d3457ed531ca8eb41dbdbd0e10aa5f64b1f53a6dac536506c782cb93e4c354f2c815407b1514cb16b4d8f02957c9f159bd
 DIST filelock-3.11.0.tar.gz 10792 BLAKE2B d2a3bfe948251136237ba216f375592f406372622005d14ba5a9e8c88b8589738db9ddbfba8b595d7252d78a2b9f18cc3c00459f9b1b8b316f943e6c07417771 SHA512 aa95176d3870a8a5bba033e3893bdc8ad61665c64137cfa35fbaff725edea30a4ab4fb70e902387fc5ec359c3c0b101777451a0e96e38522d13df3e95db0e244
+DIST filelock-3.12.0.tar.gz 11839 BLAKE2B 3c363e7e7ca39ddf21a6c86ed4e98eff170c3be6d4c8429a641403dd7d90058a6f15330457f01217b994959514ad297aa5ae8807b0f1d6359455cf5776be8b90 SHA512 4bd5d9df76499e2a4f9dd9274fcc8bd507813446fa8e5852cef6c674d34d3db2313e4b79ac98eae07d6a9fe953de4ee6390baa4c9d5ab6a005c96324dd5904e8
 DIST filelock-3.9.1.tar.gz 9720 BLAKE2B 4225d718f5c6e7c81e5db5d6ac2af42ce78a6c61b59f85bf8c2aafd71509b4811542e7a7648ffa2b14f3b3e762d975296c095e322e6c6ccf8fa5f1839213531d SHA512 7a240b0014a6570099106c72b376c47b7b23cddc3e70f78e2560ccccfcee31d1078d894c2e3ec6fed2f983859543a84cac03f8834df9e64fcb0a966308f7503e
 DIST py-filelock-3.9.0.gh.tar.gz 205047 BLAKE2B 3995f7ad27bb09ca75310c4ada7645f2dd16c09ddb39663394f315443851037f2f9cf08eecb507eba521479696ad1004978d3fdd300a7128ac3354fce2e57d5f SHA512 1235ae9ebdb4c84b0c30e68be91e01eb1acbfcd15c85202fa54a3b91e4e507f221926f8886e1ec91acd4f71d2d88c08f536529b4cebfd2de4fb90118f5dc242e
 EBUILD filelock-3.10.6.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
 EBUILD filelock-3.10.7.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
 EBUILD filelock-3.11.0.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
+EBUILD filelock-3.12.0.ebuild 691 BLAKE2B a161ee66b6eda2646b813d86ac8206688c86fe14e57c8a4571d5e1fc7efb2326ae793a506a2917193b5ce0d228e615833df64aee3ee02e1cfe2741800e85d8e9 SHA512 69e2f2e3ee1a3a2fc7efd4a629ff6ba79bab20aa800828439f5b6c655f7d3848a10395617ef83a3969e75c68b378488ecd85bb330fe44beb35ce511b917515bc
 EBUILD filelock-3.9.0.ebuild 822 BLAKE2B 0e0322504b49fe5b908e501962680d1c90f0413dcdb17b37ac0785af85f9308bc805d0daf47b9758af85de08d05e78ce8e001984aa222c7514d65b9aa99e257c SHA512 4f9a65a3dd316af5bc28d9597cf14a04b16fa0f393e49dea59f53c8548c5c8edebdad5b08f6edd47377f2a65212031b980027a14480af847e64ae1d352384c15
 EBUILD filelock-3.9.1.ebuild 648 BLAKE2B ad4204547b1367db1ae6ad7a544b18d059a8008b56438a2e5b2d93874b64c811dbdfaab09500714498d09cbb06d7810893b88ddc422806594da56b9c36ddea6b SHA512 62bafa64060568259f9466b81c71b9763087aa42d80787b986651b87c8ec964857224df0cb0750cfad0ab5ea0633080b69442378f30a1d3e5ba9cb666726c637
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.12.0.ebuild b/dev-python/filelock/filelock-3.12.0.ebuild
new file mode 100644
index 000000000000..86d1f81ea020
--- /dev/null
+++ b/dev-python/filelock/filelock-3.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 956dcbd20427..9abaf37b803b 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-2.2.3.tar.gz 697599 BLAKE2B 619902202443567bc79111c15f19d0bea9e03b0fbd406e43c1f9d994975d9f529f8e58823d9f828bb8164bac6b6631ba1c00c3a1587b00afcb802082565248bc SHA512 de119d032b04eef80a99cee9658cac12f934e9a66d7dbb8304588d0c1320a8a19a8b0a78f69134a20ca26aa408db8686436c5c108ecc39e16b1eca1a3dea2d2c
-EBUILD flask-2.2.3.ebuild 1440 BLAKE2B f6989647bf38b39888785f8c938f5dcdf51abfc04e3916b7dd30119523cb33b393c553db0ca591da2803dfec373f492b9963d34f4667e24edd88ebcd0bc44617 SHA512 b6b2fba27cd7a0375f2c5ea5508672065bcf7ae8898a7fbcf2a334489dedf2e2a1772b4648b55a8aed37d819ada7af965de8573cea08f48b6dc53681c6dca213
+EBUILD flask-2.2.3.ebuild 1440 BLAKE2B eedf7942b3a18204776dc5f15e56539c7bf27be88c64d894c2ea03f236e4eeab07d2749310d82d486ac0e0869954159c788e4a1c612b658fd76a6e9bbb44f85e SHA512 d6e318e383879456cc0cd6cbda516633d4c0c3852338d9d44e785cbb37fe804bb7be1489923c2a42f09d12f2f69b2541381a6126bb63f35caaa3628f267641b1
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.2.3.ebuild b/dev-python/flask/flask-2.2.3.ebuild
index 964ac1d01910..c478dd8ddc0f 100644
--- a/dev-python/flask/flask-2.2.3.ebuild
+++ b/dev-python/flask/flask-2.2.3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-2.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6.0[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 2fbc6f29c946..024c2b975efd 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,9 +3,11 @@ DIST google-api-python-client-2.82.0.tar.gz 10656632 BLAKE2B c94f96c727f7d0cacf0
 DIST google-api-python-client-2.83.0.tar.gz 10684846 BLAKE2B 82c8c563c2f78584d0a98ac433972ac52a38a69aa5b2eb16941372260045d9a40fd6b7ee04210824bc847fb0902f46a9d0ba376056dab16202d121dd50ca4c38 SHA512 bc05ef744aa13405c41348233d111d3f34882b30b8ef1edf9581ff96d913717bdc2281d29b28eda7119c04dba7ec133cada9b1750f159aa8d9c125cfd707881d
 DIST google-api-python-client-2.84.0.tar.gz 10727897 BLAKE2B 620a24b0a887eb92116dd8b804e2164cfdfb3215ac441de2db0b9de4f489591fb494c9cf869afef9b5e2c27f893acbfd2723a3b1f7587020bded0d76e078f5c1 SHA512 4b29e41500cafc033b7ef41bb345798ded595a2638cf49219285709d3a90431b9fb6ba1c473ffcb4e54f5f4da7e229f6735dd1a3ac156991bfd129da48ab2853
 DIST google-api-python-client-2.85.0.tar.gz 10747605 BLAKE2B 832017bbd4427a70c6c3dcce215a1e23442eb5c5bed069261da1ec85ed7ac838cea530e45f794c6142beb40b188d685cf47b6a96bd8e959421d2f8edd504b736 SHA512 491fffc8911361fc69b9490e0615046668c07d4d878c16a50ca4f0bed9f0815fa14cc34930d3a1c47a54f6f32de584ef7617fadb8f0a4b6ca92cd11926b35952
+DIST google-api-python-client-2.86.0.tar.gz 10767816 BLAKE2B 532b86d49dfec724237a07c6d6c4dccbdf7a4f9d8c6a1c7f96548708c55e5851bca3e1f0f28da65edbde68a6d760498af8936be177ce5c0dda3e6809db218188 SHA512 2d1aea4a6735aeffbc4aba05affaa3c4389e2f9f121185d5a5d47e818e33ae3506bebf2748d7a14b374310531c7c3a34325524c5c48df3c882c6b2a4ce579e8d
 EBUILD google-api-python-client-2.81.0.ebuild 1399 BLAKE2B 6fc4e421d99a3a617ae046f226dae680e2b44e1f80d29b30e4aabfbe1d8fbc55d7916ffda97c754e69f64b61a7b631237a1c7240d23f683f7b4db0797ca6affd SHA512 122cd23ad716177a236ca4a799461a15a6e4960abd455813f731b3263cb741198c679f46c35131eac91c43da913ada1a4d6f87945db5e145c476db156063f097
 EBUILD google-api-python-client-2.82.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 EBUILD google-api-python-client-2.83.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 EBUILD google-api-python-client-2.84.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 EBUILD google-api-python-client-2.85.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
+EBUILD google-api-python-client-2.86.0.ebuild 1316 BLAKE2B d6d158b0cdd8c45d8d79dbc2977291d7e3342c7f53da3adcb227708ae8f3161413381d971dddf63b941a32b94133a6cd4c661d7b76863a5d3162db0495fdceaa SHA512 762a1b2c0e8c06f60e01fd9045abc4255999039a97e86145bdbe8ea7727d2bbfd3defd6c6e932a726f0efe001cb0364d1640f2a808c531ff57ec66d8740d9d13
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
new file mode 100644
index 000000000000..0194f9640998
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 50bce160df24..aceea2907633 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
-EBUILD helpdev-0.7.1-r1.ebuild 667 BLAKE2B 8b55f5e9ce63be9b7dc5c96584d2528b348732c8a102e333ff0b4d0059277732fbc1ba9b500ed472d398333942a468019b01cf0861ddb4fa8ef3fcdb15f73856 SHA512 7b5794868154712545a220ddba132c5c080292acff18f49ea6d3f9f2303ea3cdd5e8eec14c3116b3f9b3f4b113f1ee9a6f3dca517284f902b9dea84805c4d05f
+EBUILD helpdev-0.7.1-r1.ebuild 667 BLAKE2B cfdfeba216925a5909e7629797a92bb7b4f9013c78e4b2d4eb6c2faa2245c3089623d9b4b36f87d099ec5bacf8a0aae96aff043dfbb1457d2f6d94ce1f0790ad SHA512 42dfd562130a1a0a33437081b478a3693d89835ffc673321c0a9f33d1b3ac732d42a5a886faff8a4e35447f01384d35ad272454c74ad0debb05f8b8f2d9a374e
 MISC metadata.xml 318 BLAKE2B 4a61e7dea5dbc9072284de83ba7e0a4ff94e2f2be82e16020eaed70fe20f66f6fe869bb130ff5f209c02a5d88b4ee906376ed88f213f3454e32a15a16b092f45 SHA512 522f67355d3d3e8010167c5c888b0b4f7b5738cf74d0355039bdb989273dec57e4dd07810af92d6898c94dcccadac9381c9e399106031119fda5b91806369fcc
diff --git a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
index e56a90a6b643..3766a309a6b8 100644
--- a/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 )
 	dev-python/psutil[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 59e11b3323b2..b1633a8ab520 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,15 +1,5 @@
-DIST hypothesis-6.68.2.gh.tar.gz 9350253 BLAKE2B 5f98aac845a2f4e1dd9f54809d3e7e1b201bdecdec1c5c9cff10a37851af7d8d9e8cb643c1a9b0545672862b3639a17aed5f4197653d48d3114edd0105668307 SHA512 c3507f99376af924e375c51e0d56d4e444204d2ebe147d813a3f33a69594f83493c499714567b127556ea620df7bde58f4a1ba662bb182907e5e0d14cf13ee81
-DIST hypothesis-6.69.0.gh.tar.gz 9350681 BLAKE2B e28bca5be08809d7f10723186957ab72a650d93403fc0c5ed91b329ca3c68b084a69aba093e8dc7fdc742316287dc585b7b8794403e0b3fa29adfc7bf2d76ee7 SHA512 b6a263a10f78841706f6fa58a237f2f1e7ef5efd4d859e0fb79bae0ad3eff86774bc0cb7bb581af89605f80514a08386b5f501a6154bcc5ae1f56e7eb2ba61b4
-DIST hypothesis-6.70.0.gh.tar.gz 9351669 BLAKE2B 04e6739a1e6cf5907486c5fc6e09d17996831fe7967df4a24e6fb3c3ab992ef0c1ade9f250a1776eed4d6880893db1e8f284df60465a81a9f14f4aa64b0b0fc9 SHA512 6fb15addd86f8737b5a99a5c4ae5f2899133772e25426cc8a9bd086ddc0246b8fd323a10213df45d5b13c0740df19597a2b7ee7566611d5d01e6897954ac0f4c
-DIST hypothesis-6.70.1.gh.tar.gz 9351685 BLAKE2B 99488f4caae4da403ebe28c2c18829d493ea76515f4a503ece0063dad2638cc5d05f9b55372d5c457b0dfc3af31d3422c44d647ea0c2a92a83b20d64c70c4b2f SHA512 a858df7d469604b2d43d003c76f43e40931f6024f6cf164c9b427a449cd0d843df401052e3312c529fd4467d80e0870810ad6863812ec53a47dcf9ec82336472
-DIST hypothesis-6.70.2.gh.tar.gz 9351849 BLAKE2B 074003592741cd89ae9ae44b3857daa3f5d1c8cbb0ab3513f3930b27fcc4e27417994c4240fbbba4649cb04716820db0e9c4f4ac745c194535a81b8a6197f7c3 SHA512 20f812ca8e005877893eacde1bac796495f8697ecbbd6da5f807a9ce6d7e310682030323a8b7bb3e646040253968d2f15cb6fcc858f47be631ef62af4924ac78
 DIST hypothesis-6.71.0.gh.tar.gz 9357031 BLAKE2B e4a83a94bb6971c3ecba4cc69655f9da23a83ab48332a7a748ca7364d9e549a671bf466e32f6e65447f809a9917fc8fd2548dd26764173ea5849a4df3e027b54 SHA512 dea1d5ec1b753649345edd784183f171531adb583e33d0e5d12b14554169fa054e05f4c16135171c708c208b42968082b3ce79cc0441efccf1eff6da37c59f97
-DIST hypothesis-6.72.0.gh.tar.gz 9357320 BLAKE2B a688d3bfa90d4b335c022ed823e3ab3c9bb7b6e4404e62259e65faf7d2867d6cb8379b14a8328294c325506278c6523b9a14f6798110d67c9b636a89720a3ab9 SHA512 7d5cdf91114a34267edcca10295ee84005f2799ed58e7125c584fcc49171e60383a80c7a0040e41d24b3225113cb354966d40f61c94a28bcdbd596582577372b
-EBUILD hypothesis-6.68.2.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
-EBUILD hypothesis-6.69.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
-EBUILD hypothesis-6.70.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
-EBUILD hypothesis-6.70.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
-EBUILD hypothesis-6.70.2.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
-EBUILD hypothesis-6.71.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
-EBUILD hypothesis-6.72.0.ebuild 2136 BLAKE2B 35dccc51dab2ed18059ac3a0f38dd2ef843ced097a386c953410198590c3b4ac2b1564bb9a347a59644e153a6de8924f72a6eba3927da545526a31d5853c4463 SHA512 d718a18708427023d2057554e99e463d35995663899ee6d4289a96dc039f498e2b5b5ad0b21b952ef598c84a867c3bbcc7a1d97fc34c11fcd2f8fb018542a5f4
+DIST hypothesis-6.72.1.gh.tar.gz 9358351 BLAKE2B fbb760194c944cc939e9a9b83a461be22f9e5081d865f0dfa3834375d464714178dca64b9e1993fa4b0855e90f6e133a81d22699acc91560f60f137e8589798c SHA512 1a9d4b103f714e27ec5e33efbdfda0cc3febbe77caf6f605db7fb3b2df857712682a3cce80e75f45f9cd88b1715789d7fc2c5a7d50edbf66a699f5381e2671e5
+EBUILD hypothesis-6.71.0.ebuild 2128 BLAKE2B 74e1a7c5fb6d1d7b9acdef8a94993b3d0b5cc446b0c7208daf25065c5238d67851a417d3d0b73f8a108bfa7468fe10db66d7682c467a5cacc6f7cf7beb692651 SHA512 2b76881fee9dc0ed2dab414ccbdb7bfd63102b72b8b8664668e37164e944f444c9c001d7144ee22d05f3d0b3de9175874b1fd993a108eda4c2c388dd978e1ca9
+EBUILD hypothesis-6.72.1.ebuild 2125 BLAKE2B 51d07695cdc9af22cb2b6cba55a932a31325861d109fa77216c3dfbd5bda0ddf4246014e90faa2559e7f50334ad5eb33efb377be5319525e664f5c334106ba87 SHA512 bcc6d5b8eafde5dcd3aef80abc3485974131f29975500ee6359fad0aec7d1759848fd131d9901a13a5bc48ca880149b9ef72e5baad1a1368a9300bac65cd7807
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.68.2.ebuild b/dev-python/hypothesis/hypothesis-6.68.2.ebuild
deleted file mode 100644
index 53e3bebd8313..000000000000
--- a/dev-python/hypothesis/hypothesis-6.68.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.69.0.ebuild b/dev-python/hypothesis/hypothesis-6.69.0.ebuild
deleted file mode 100644
index c793a8a143d2..000000000000
--- a/dev-python/hypothesis/hypothesis-6.69.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.70.0.ebuild b/dev-python/hypothesis/hypothesis-6.70.0.ebuild
deleted file mode 100644
index c793a8a143d2..000000000000
--- a/dev-python/hypothesis/hypothesis-6.70.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.70.1.ebuild b/dev-python/hypothesis/hypothesis-6.70.1.ebuild
deleted file mode 100644
index c793a8a143d2..000000000000
--- a/dev-python/hypothesis/hypothesis-6.70.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.71.0.ebuild b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
index ccd35ad36fe8..183fd03a9bae 100644
--- a/dev-python/hypothesis/hypothesis-6.71.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.72.0.ebuild b/dev-python/hypothesis/hypothesis-6.72.0.ebuild
deleted file mode 100644
index ccd35ad36fe8..000000000000
--- a/dev-python/hypothesis/hypothesis-6.72.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.70.2.ebuild b/dev-python/hypothesis/hypothesis-6.72.1.ebuild
similarity index 96%
rename from dev-python/hypothesis/hypothesis-6.70.2.ebuild
rename to dev-python/hypothesis/hypothesis-6.72.1.ebuild
index ccd35ad36fe8..15f6983ab24d 100644
--- a/dev-python/hypothesis/hypothesis-6.70.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.72.1.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+CLI_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
 inherit distutils-r1 multiprocessing optfeature
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 42c1a4f54abc..f42eda9dd729 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,3 +1,5 @@
 DIST iminuit-2.19.0.tar.gz 433221 BLAKE2B e7aac69f74410ff53597a0e6ae44597185fbf4199ee72b1b1b98676c929550e81e155ce8ba768daf672ec3617b833d08a32ec22996459a1dd02fefdab489ea78 SHA512 9f3f86d0717a4fe50d176b6cc6b6df879d4d7b7e43262535627925d8a61dc3e0bde74a41c662c051bc1b136552c5abdaebca800721c3934332212c4ccdf30d69
+DIST iminuit-2.21.3.tar.gz 437827 BLAKE2B 5196e896769f6312bb6ba9af8d6f03bea6023a9459ccbe8553e4c10ba5dc2ed90e4e4b57bdd104f7b72e7514a50c0d4c717c76adf206d7eaddcd3c4c54c4d210 SHA512 5e48d4451caf56688143fa4590528fb4ed0660e144dbb3d1c409b84f793593478979728b4af9748b7bbdb7063e2ef7e05476a2ecd52af089f351522aadfc9ba4
 EBUILD iminuit-2.19.0.ebuild 900 BLAKE2B af3843f3a479c90778836d0ef728e421889d547ee9e9f8f9f690f2b189ebf9c8f53a247fd4cf9fb79089f38f0741eb6222e48955bacb1e2a54bb0c0199082984 SHA512 9100e92cd1ecd9266c6ed863720499b4ea1f7dd4060886d433d8c028aaefe33df8d15b343f5ca5ae07d4e46f95fee0212b69dcc900f3b10ba6ecde09a42a0f99
+EBUILD iminuit-2.21.3.ebuild 935 BLAKE2B f816242e6533fdfb0c49d391457ea02a0e87c6c767fdd62c855ef13d75f68856ca1a52ad75cfbc6e8449c837b7482ff7df35afd727d3c6f2a7ab1d43b5fb70dc SHA512 e7c8bee44780c3f479b87a88ed2d0e956327d5980d33cf78f8c07a25763cd709073ce713b90bdbd71249d06b9b1699eb181e5512447b9570ad2ded2559af029a
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.21.3.ebuild b/dev-python/iminuit/iminuit-2.21.3.ebuild
new file mode 100644
index 000000000000..5b482e3c236b
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.21.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx pypi
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/
+	https://pypi.org/project/iminuit/"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	epytest -p no:pytest-describe || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
new file mode 100644
index 000000000000..e0888b5a2fca
--- /dev/null
+++ b/dev-python/importlib-metadata/Manifest
@@ -0,0 +1,5 @@
+DIST importlib_metadata-6.0.1.tar.gz 49963 BLAKE2B 8f915035334965ae373977814d335b66028f85372f96a9815fe3e59ca346b60d64c16e147e8a9d1ce44e26b31851dcfbda84002fc1a0d93c0d154115f5acec4e SHA512 9ee241a8865d181fae103e643ae618f46541ba9aab299df32892739db991d78b4199df436f77d7c28aeb736e4c2cfb38301cb7133d8baff3c149f4421e0431a1
+DIST importlib_metadata-6.5.0.tar.gz 53101 BLAKE2B a22b48f3ea927c9588fc15f4731c8ffd2a51fb3544c0c74ab48d44a3949f2d981c63aa3714914e02ac3a8035ca0a0e726f790672fbad9e39e3158e251d90f7c5 SHA512 c581ff46d601a239ba9e83114a18b1fc5c0245c215752b8313624fbef6b441eac7cebd4e021d09f12d26ba30715b99475eeeb66befc49bcd609f1b53b79f9bfd
+EBUILD importlib-metadata-6.0.1.ebuild 1491 BLAKE2B 85d658995c805e72f1a29219bdf02dda157f59467e60ea71c8aac3da460061d4727d8857e5106aeb32bc4bf477cc20d6fdd6c31a559a54524db5d18564b06e86 SHA512 dae220b46f6bf663d2d581a45f63357e7b48984f5e0b355066e77752133d4d34346a6eb3c51c28d8cc3287e9c8721cb4688d90c25a8b062df38ae42d142a679d
+EBUILD importlib-metadata-6.5.0.ebuild 1499 BLAKE2B 6ff7093c7c32573ed924141072355ff974acbd35c2de2b54a373bc7d623da793e953e62bb00d901072792ae7aa813cf8b46258c0a85084912bc21c1924097b04 SHA512 80710c36b969493a85f0e71a51a5a244ea39025e19acc7ce5fc9723dfb5a09c54baa6db2adcd7231811202e92824a51747efb0040a6d7f181bfa07fc12647f1c
+MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
similarity index 96%
rename from dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild
rename to dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
index 7e5fabb625bd..bbca64472891 100644
--- a/dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
+			dev-python/importlib-resources[${PYTHON_USEDEP}]
 		' 3.8)
 	)
 "
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.4.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
similarity index 96%
rename from dev-python/importlib_metadata/importlib_metadata-6.4.1.ebuild
rename to dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
index 94609d071b76..9c9a3496dc21 100644
--- a/dev-python/importlib_metadata/importlib_metadata-6.4.1.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
@@ -29,7 +29,7 @@ BDEPEND="
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
+			dev-python/importlib-resources[${PYTHON_USEDEP}]
 		' 3.8)
 	)
 "
diff --git a/dev-python/importlib_metadata/metadata.xml b/dev-python/importlib-metadata/metadata.xml
similarity index 100%
rename from dev-python/importlib_metadata/metadata.xml
rename to dev-python/importlib-metadata/metadata.xml
diff --git a/dev-python/importlib-resources/Manifest b/dev-python/importlib-resources/Manifest
new file mode 100644
index 000000000000..b1f42f30a5e9
--- /dev/null
+++ b/dev-python/importlib-resources/Manifest
@@ -0,0 +1,3 @@
+DIST importlib_resources-5.12.0.tar.gz 39894 BLAKE2B bbae92bd62b54afc0093f8daa8f0fabaf18da7b2c9c578a2e6b6b7cc3207384e4fd037762c4ac8bc862900ac2da112a3b8ae236b1d3ca072c739f2d1ad3edd36 SHA512 00875d82cf3d2103872079ee2882c4000cc65141d97988265721cc6861a64dfe480e5c2191a2b22d0b9b9e42de1fc06d54f6d8eb4f37aaf91a819ee9306dc06f
+EBUILD importlib-resources-5.12.0.ebuild 1233 BLAKE2B 737f5ffd7b10f7d72a95f72c42d365302dd6a6f870897f97d606ffa6ec3fb3d2e4585f0774144c3e2361ccbcb924ced8c29a62ce636f9095678b070066c72101 SHA512 9f4c1710a9741fda1bf3b7eb990894bdff2a73cb8f265f259e1983c6282480e839cf5cf2d3b7cf19bc5272e38d9836d32627bb4ac6c9aec01832e3cf6acc592d
+MISC metadata.xml 839 BLAKE2B ca4c02fdd3da2595a0011a145cf06f5401b6a5bf7381d23db7896a8ee63763bcf01d67a65e819e03f9aded78c8237e4c8e11fd836b8585fc4ed765572eb1e931 SHA512 3032eb1ae6322ee29a95c93fdd155ffaa4515f5ee27039b19b59c44d0160c7aeb6fb7b8b53a57d74daab8325ffdb15bb776c123afcaafeea6241ae67f55675cb
diff --git a/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild b/dev-python/importlib-resources/importlib-resources-5.12.0.ebuild
similarity index 90%
rename from dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
rename to dev-python/importlib-resources/importlib-resources-5.12.0.ebuild
index d58bd2f35331..d1ac2513af5f 100644
--- a/dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
+++ b/dev-python/importlib-resources/importlib-resources-5.12.0.ebuild
@@ -9,17 +9,13 @@ DISTUTILS_USE_PEP517=flit
 # as well.
 PYTHON_COMPAT=( pypy3 python3_9 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Read resources from Python packages"
 HOMEPAGE="
 	https://github.com/python/importlib_resources/
 	https://pypi.org/project/importlib-resources/
 "
-SRC_URI="
-	https://github.com/python/importlib_resources/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/importlib_resources/metadata.xml b/dev-python/importlib-resources/metadata.xml
similarity index 100%
rename from dev-python/importlib_resources/metadata.xml
rename to dev-python/importlib-resources/metadata.xml
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
deleted file mode 100644
index 21935d0b2c59..000000000000
--- a/dev-python/importlib_metadata/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST importlib_metadata-6.0.1.tar.gz 49963 BLAKE2B 8f915035334965ae373977814d335b66028f85372f96a9815fe3e59ca346b60d64c16e147e8a9d1ce44e26b31851dcfbda84002fc1a0d93c0d154115f5acec4e SHA512 9ee241a8865d181fae103e643ae618f46541ba9aab299df32892739db991d78b4199df436f77d7c28aeb736e4c2cfb38301cb7133d8baff3c149f4421e0431a1
-DIST importlib_metadata-6.3.0.tar.gz 52838 BLAKE2B 9d7e247f712de55c079720118d5ab27731b305143b69cd425d3e720e223888740a17818263125c9db9f64f7a715efe2922722c6328474926d05db4753c699185 SHA512 bf6b4961d2e98e873f6842b6ee348dde9445e7aa1faf2c599a9908439312b03a532db5978a5311d60d8d992be0b882b2b496bf721a6af2ef7f14032758055cb4
-DIST importlib_metadata-6.4.1.tar.gz 52684 BLAKE2B 216e0ee6d1775b3734b15919c6c5fc9b557fccf106b83bec6388bc514557dc16f6ef7a9ba15e9cd1686fa85aecffc10829f80c6d42e984b8da3b1dfc982aca07 SHA512 925336d321872a01b8c1b6384fa494c912d69531c5c9c991af43b09690a40aa5aaa2e9c6f47345ed8ee7e0d6b632758c4111a5558b5bf1b659b99cad0bae908c
-EBUILD importlib_metadata-6.0.1.ebuild 1491 BLAKE2B 716b361e65cc00524853b7b6626eb813abd547594199ef1ee5b49f5af6093897fb5cd262d9a5eebf70fb79d4cbfdcad47ad65885d0790155b05a373659ed10c6 SHA512 9a6d6a0db7b90e3a2c4d329abb875168fbfeedc256d25320cfcf248a09b027a02e3dd439e938a64cbf560be746bb44ea76352584e92778976774f769010cbd11
-EBUILD importlib_metadata-6.3.0.ebuild 1499 BLAKE2B 7fa11d410c84a54a456773d3e41cd8bb3738b7ecbe4732d7b42a32aa5c34f929ce48b6b4e79292ab6889366f21020d50581bb23228c511e2075e005130c57b36 SHA512 9eca0ca6e0d6f36e9d11f5e5bae015476949e9e8347ebf76e8b34ca1c599cff206d1be86b5e340a22c0e0dcaacf81dd6566f28a3fd5d40f28987dc15244245a0
-EBUILD importlib_metadata-6.4.1.ebuild 1499 BLAKE2B 7fa11d410c84a54a456773d3e41cd8bb3738b7ecbe4732d7b42a32aa5c34f929ce48b6b4e79292ab6889366f21020d50581bb23228c511e2075e005130c57b36 SHA512 9eca0ca6e0d6f36e9d11f5e5bae015476949e9e8347ebf76e8b34ca1c599cff206d1be86b5e340a22c0e0dcaacf81dd6566f28a3fd5d40f28987dc15244245a0
-MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib_metadata/importlib_metadata-6.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-6.3.0.ebuild
deleted file mode 100644
index 94609d071b76..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-6.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
deleted file mode 100644
index 763dac154c35..000000000000
--- a/dev-python/importlib_resources/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST importlib_resources-5.12.0.gh.tar.gz 36161 BLAKE2B 1adcf5e2d0292867eb0b96819ee5d808b62d7f479a6fb4254db50b0397814b0f6ffe4d209f4dfcc19147bd060888cfd457391de9d6746b1b85f58b9d0792e29b SHA512 038d44919ace6d92709855eae0d111ae772edfbbf79e82349a34ab143d0ec9ed796a317ff3e1a06a08404d4a58398d130a1a4f425d26511e724bc03946679d19
-EBUILD importlib_resources-5.12.0.ebuild 1329 BLAKE2B 20018d9c6907179ddcff957ae297208807ceeafd30e7140f14e6a4fd5797474a2b3a4a37b4cc032a2ceed0a9e0cc9cad66fdc71d12b7651feb32bcae2a27b306 SHA512 b32abf54a052eb1aec3432e92d79a55a825087faa39e6d195f67fc4ba83d5e5302d178866e806f42dade40779c6137b40e8dbe9c0deee7ca2a85ca734e1525fa
-MISC metadata.xml 839 BLAKE2B ca4c02fdd3da2595a0011a145cf06f5401b6a5bf7381d23db7896a8ee63763bcf01d67a65e819e03f9aded78c8237e4c8e11fd836b8585fc4ed765572eb1e931 SHA512 3032eb1ae6322ee29a95c93fdd155ffaa4515f5ee27039b19b59c44d0160c7aeb6fb7b8b53a57d74daab8325ffdb15bb776c123afcaafeea6241ae67f55675cb
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 91de1e28c2fd..4edf45b79104 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,3 +1,3 @@
 DIST jsonschema-4.17.3.tar.gz 297785 BLAKE2B a0383bf5612ae50e94c95dbc1774d796b62c74a7aae3056a40edb7e042ad07fd7885e61d86220120a906a4017afe30d8ee8edbbf0cf01a6dec1f212984ff1c1e SHA512 626fc913c37d2e49e4b47c9e058aab4a96c1dc50c35d8def0b2ea0ca464dc25e3318d4fde4927c11ca38068743cd81779d5189464b821407ac1de1788bad30e2
-EBUILD jsonschema-4.17.3.ebuild 1586 BLAKE2B cb6189c805c393e85ec1715fa1d7f8602beec467018fb923739066e84d168eb51ed136b741c1ad0b4ba6a9af68b68a2b59c13ba23f85a95748dba9900a2e02d5 SHA512 549202781ecaaa06b57dc0f650f0e9bf96d3eec0e96b817adbe61c14b08afa7ce2539fe550dcf0840a9dc2b89b1b864d0cfc0cb5d26f3be9d37eeecacfdb89ff
+EBUILD jsonschema-4.17.3.ebuild 1586 BLAKE2B 90461ed7677ab9a6806a5d00b1bb8f21aed6d3a7a6f06ba9a51cdd988d846331f2174791f13c9448c1315a55e7e0c35f37baa2e73d81bb4e04a2eb57cc344124 SHA512 0dfb81abc163a2c3201ea90bda452847794f3a5dd9fb221c186ef681d8a55ff7d998138dd721f0a09385e592ee4c0b342ad5984341eca83c828706ab043ddf29
 MISC metadata.xml 705 BLAKE2B 731159cc340e6cbb15fe5a8d374188c8df685e8f8294d19af54ca3d209beb8c273b6e901b6b7fe75401324b8512ffb7f1870aefa8d4a139d1e3b84147d993af6 SHA512 1069fb33b2cf47d3dfd5e825b23ba1efa7d764d0d23aa009db522d04bc08362f5ca646411ec405cd33152a65ea8de2ea90d3dd6d4d4bf1a947ae7943e9d4c727
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
index dec1ef64ff10..db5281e85891 100644
--- a/dev-python/jsonschema/jsonschema-4.17.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/importlib-resources-1.4.0[${PYTHON_USEDEP}]
 		dev-python/pkgutil_resolve_name[${PYTHON_USEDEP}]
 	' 3.8)
 "
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index c7e4ab8badbd..edb99cb2c33c 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,7 +1,7 @@
 DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
 DIST jupyter_client-8.1.0.tar.gz 335241 BLAKE2B d9491f958b21ba09494bf42ff5a3bae786388a16c007f5756df8900fc53c6fdb4d67bff09b16290338d07fc3c3466483f20ab82482fb235e0e55481294eaeef1 SHA512 21317e5ca61b72408e94116f0be545753088d891742579fcf7a451be179a7783dc153d2898e0ff50ce06017f90cb48f907a5bb056090b13ec0da2af7287f6dcd
 DIST jupyter_client-8.2.0.tar.gz 335567 BLAKE2B e02f8813d12ec8ba0e15291dad04cfaeeb98ea524050a10d142d74af203e43aa1c2e22e7fd7b071c05831b3dd644985a42e38f59fee65f4570e5eb88bbc9fbb1 SHA512 1337c4f2d93d9cd2ae5e3d8f30a8e4af69dad6e09c97e949d9300df0668be4da91134c73da06eb417c10ff2c09fd7beb28699e7a17502ceee3453cb9323b4363
-EBUILD jupyter-client-8.0.3.ebuild 1295 BLAKE2B 11c3b7bf39626ebb65e8933ddda228a64e4f559195676ab34c34d42094fa55b4ed2be88b59809f7a0d54412716cf25496d8bc3d6a6815e3d154fb1ec79e5a2ef SHA512 c927b5cc9d3a9ae91561dac5467d2fb06ddc03dc6dea77d524a76edbd2d063e6a092ca404b6a3b418a4c9870729163e569b22458d7dfc88f95a48e76c03056a4
-EBUILD jupyter-client-8.1.0.ebuild 1303 BLAKE2B 7eb1fa187f769e9ca218d61ce76d7faa575ef5d97a125daa3a1fb7aa6e96d14bc74d7dd46a1aa862722419268aaf020d3487dd466b2fc2e9e1209582cca443a5 SHA512 c9840f9901034f2876b3c44d15499ae0d6604d15df56a50391f0aadceed752d38a725fe7b6146d5f8bb55a384c147ee655a42b0c2304956e3911b0bffdf22ed5
-EBUILD jupyter-client-8.2.0.ebuild 1309 BLAKE2B f5b40330b3ce615fca940d64d0bab1117adde14bd361b4bce56c35eac7536d80a7025772f2add8fec2b8222b11003b6c056718153653292c03ff017b451e0bcc SHA512 7293217b0bac1fb14eb3ce7086cda37b857348ae097cb0e7725cdcca05512b6bdc9bfa2c89978c77db088496bff81064ec8f68dec6e5bc10b49dcab19c211f37
+EBUILD jupyter-client-8.0.3.ebuild 1295 BLAKE2B 26f75a630e85900558065cee4ba35f02843afdebc7f7d6192fc36e299795106530538be0e6324f54f07ead055ee34ed040555a3e63a33d59fdd1b030adea40df SHA512 c59499100078bf1cc221b0ecc5de5fee7096878a875211a0029e574c0e312ba8cd10037f3ab02dd33730ea469cf8fac70391245872c3305a66776948fca7511d
+EBUILD jupyter-client-8.1.0.ebuild 1303 BLAKE2B 7d29d2eeb39cd4d0c9af12b7973b6e840bf70b79205c8ba7b43366b3e72169f1b829de5fb34f8b18e32629fef41a7584cd4dc98a3687647fc216bd68a80f93b3 SHA512 de16b117a6d17a39420b59c47c603eb603e963ddc3e68a59dd028b67a7483bc7c350b0bd885f81c4ae8dc7b1ea46e472a76d0902c9886bd1ec7184060c9ce4c0
+EBUILD jupyter-client-8.2.0.ebuild 1309 BLAKE2B 0c8539774983f6a5ceba3d98eb88d45be42358ce4feb8207aa6244d7b3d477ed5b83254f4fd0417979967194e34bd745ad3191b5305a7e9b0ab98230bf8c61f8 SHA512 949a0e1bea07d99e884fe78f6b71ec1824c7137aeff357196a29ad9487d3c42a053cb67dc310960ce88f976b0a31214d9fbd4969297e2c30a2af05cfdf6846c3
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
index 5b8619ab0d01..078bad324f86 100644
--- a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
index 503ce6564a01..675053085812 100644
--- a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
index f94d688c0313..10a33a9f9e25 100644
--- a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.{8,9})
 "
 BDEPEND="
diff --git a/dev-python/jupyter-lsp/Manifest b/dev-python/jupyter-lsp/Manifest
index cc1d5ae1e24f..4882a1b622b4 100644
--- a/dev-python/jupyter-lsp/Manifest
+++ b/dev-python/jupyter-lsp/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter-lsp-2.0.1.tar.gz 43962 BLAKE2B 0a030542297c6a311ca2b9a681acf4ae4d196ebaee342fa44a7a5b0c9a3788aecdb7b6a60a4653114ae6c5a69f4da9108a831eda72401643b8bb34cad6d3de43 SHA512 539851c567cf0dfa08c9658fe98941a8aaa90f625cba1d231d54fe3f4e19cbd9f14fc5b54c39798af1d1da40075dbaa7f43e95517934571391c488639f9c66b3
-EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B 501715ae2cea44c0accf7f3bcfdd5f7090e575cc4e7f805340c80b3973538958618a3b64b77b426ebf9c4fc0b577c7a9bb4ac07828138cc54ad7847eccc2519a SHA512 98ee9d7e3f7329ca072d87ce04fb460de99a83cacf8e1157368be9d99c85f0eb7724e3dadfcde54b5a46895e47a286584131984563218d074dfeab29ba86cb44
+EBUILD jupyter-lsp-2.0.1.ebuild 2743 BLAKE2B bcad3f001aa2cb92fcbd9b7f9a8e1302e8fc3e2c6328a4fd7dde58098b15906c0f2eca5022b1b82119130ee1ddada766020d18eba831324bb1349e782f14f704 SHA512 8d33d169a193fbc8f3a2fd1b0cd9a1bec168c44550395c02d56a2952ab4e8677931720b27b6fc441faacadd1aa0bba3e39adf8cad83768643bc40e96f9df85da
 MISC metadata.xml 417 BLAKE2B 37e0faca144a5da718475df6e957d9664fa5a757735bf65985dba486180dce37621cf3c34cadef4dbefbdb5698192b601a8e0bb1c77f71ba5550e65e47cc5e9c SHA512 6b61ffc68a46993386baa1c1b95850edbfbdb8d4fa40c4111aaf4edbb7d8d4f8ed21960ee01e69e2a8b986f66c6ec4ff938392d7849e204936f05d62ce7e8531
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
index ecaeb7c5b929..6e4b32461a3c 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.1.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/jupyter_ydoc/Manifest b/dev-python/jupyter_ydoc/Manifest
index 017baebdb82e..b6f925ae5bf2 100644
--- a/dev-python/jupyter_ydoc/Manifest
+++ b/dev-python/jupyter_ydoc/Manifest
@@ -1,4 +1,4 @@
 AUX jupyter_ydoc-1.0.0-no-node-for-version.patch 846 BLAKE2B 11112ffe502a4fa87abb4955f082ab6beef545a4327bb449586f1b837c78cce2cc863e7b40d71690920da6bf1346c8aa84e462cc9f16c7b51fc6a539ccea5dac SHA512 e9d82e27ce628a1e96fade29429c2532637c89cc6ad1ce307d74f493096ab003f5a9ea35247976ff6f7da8af566ef69c4cd82cec3ebd8a2a6bb72d67148b53d7
 DIST jupyter_ydoc-1.0.0.gh.tar.gz 985632 BLAKE2B 6e4456d3eb96f40e4703d7a1413d62d82497ff46fa15c3e0c6a9dd6544cdbddf5cb5b24d87e135170af643bc45b6b88a0a5f5a3fd03986d85f8428b5f12c4b85 SHA512 7cf8f37fb28ce1b0cf02e5e2db642e6fd5debbf5cb6a119b5291ea2930b177d5f17d7236e105891e828e2c0a4ced3c06cb4e78a1b6c2c318e2674fa5da2a8b8b
-EBUILD jupyter_ydoc-1.0.0.ebuild 1140 BLAKE2B 306b1d295ad5941bbffd147083e7abb0fd77fd44110245809e7d8176e3fd8dbd8817fdd4341b60466d834d2bf1b3189e66b42e95a3257d0b4d0ea954eb377dd9 SHA512 83dbc392909c6a71db5587ddf6c7acb19946252364ce265b1d12fa6227cc1d3eb3b6b3f81f520e66b4582e9f5bbcbb11a7505b93936b4e3d799fe6567527d907
+EBUILD jupyter_ydoc-1.0.0.ebuild 1140 BLAKE2B 230664913c65c2147662820443c8b709e9e598121f6370c00dc6f4e34df39ba437d6431854d7fee0c890800fbb087ed2bdacf500486f8ca0a2db6cee7e9b3269 SHA512 8fa5ea3c07e952ed73ba0946b10cfdd5e7d83c8f4871683bdfd0407f00b53da0f3293ba5fababa4aefc16c53f85c640829d56b40db2576622152bed217441eed
 MISC metadata.xml 433 BLAKE2B cf2579c7d85eefe97d8ec81f37ac5e10deee9aaf52b16cea8ce3649f6076a3afee9e7ce6efbf82cd7713421353b53c16ed4d28b03a9b6e8b5c029fc6f3615651 SHA512 1258a3f0bd2a959055312594eb72bcd06fd639cf777543b41919da60b4082d241ad87231bdfb8c2ef057c85657875ac596b732301d3fb0c9a10cea5d2746234f
diff --git a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
index 8f9b6f8ccb4f..bd7d147fe489 100644
--- a/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
+++ b/dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-python/y-py-0.6.0[${PYTHON_USEDEP}]
 	<dev-python/y-py-0.7.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/jupyterlab-server/Manifest b/dev-python/jupyterlab-server/Manifest
index 9a965ee15ea6..8830a4f706ba 100644
--- a/dev-python/jupyterlab-server/Manifest
+++ b/dev-python/jupyterlab-server/Manifest
@@ -1,5 +1,5 @@
 DIST jupyterlab_server-2.22.0.tar.gz 71374 BLAKE2B da27d6fb6d22db4aacd4c6c7a96ca748c5ba95d6b357fb45aa3383642b23bff7b61298eb01b8a80073080248e06fae35e04b1a7e4144018e84a6b548937ad0e6 SHA512 96484afe03a23f4aa6492b15e64b3f874b144af371d65c94693b708f9152e2762f98f0dea2b7464f8240740f4be56b2cd61a8869ef001521bbb4748dd0fc7005
 DIST jupyterlab_server-2.22.1.tar.gz 71443 BLAKE2B 37273cb3251f358607936bb723e4c9b7d15aa9c6c0193d9cc14b5cf2ed07a5a50d8588b42c243193e3efb30cf0e000c6ea19f725e0f2c943eaf56d3b161dcbd9 SHA512 01d223b59ac906b4bfd5cc46db375abe67ffd518422625cae06e08266bee908dcf34b4544ff8f12aa45c9ac00a6473e164735423a9c55290f922a0e2d930eaa9
-EBUILD jupyterlab-server-2.22.0.ebuild 1962 BLAKE2B 297f1ab91e6eaabaa77d206491dc9974bbf660ab07d550a2c3c84d67a33bee43f17cbfac8f0799614d58654883c3183cf4e68b080f662d72b4fbba3de928626c SHA512 614c0687d7f35038feec1b7ed84cc0548c8528c149d87b01d1983fcdbc167dde4d52d1d34bf1dc80adbf497507b6cc4f0b2e8440b50e8d20cc28228d130475a3
-EBUILD jupyterlab-server-2.22.1.ebuild 1962 BLAKE2B 297f1ab91e6eaabaa77d206491dc9974bbf660ab07d550a2c3c84d67a33bee43f17cbfac8f0799614d58654883c3183cf4e68b080f662d72b4fbba3de928626c SHA512 614c0687d7f35038feec1b7ed84cc0548c8528c149d87b01d1983fcdbc167dde4d52d1d34bf1dc80adbf497507b6cc4f0b2e8440b50e8d20cc28228d130475a3
+EBUILD jupyterlab-server-2.22.0.ebuild 1962 BLAKE2B 02abc58b2676bb4e6917f33bfdda52bff3ee9fa50409f585ececb1d9ba4ef3491fbecea0e4a3befb8a93cec1a4aea1fb0fc019f679e185229db8b4ac8e2c42ef SHA512 f836776b3c0dbadaf416b1903472c052eab9fd6d2d14da99fbab6bb27f30b6ad70174e8d67cbbdcb65ad17fc502396fe5887069fc81382c043b80f4e4e7a729b
+EBUILD jupyterlab-server-2.22.1.ebuild 1962 BLAKE2B 02abc58b2676bb4e6917f33bfdda52bff3ee9fa50409f585ececb1d9ba4ef3491fbecea0e4a3befb8a93cec1a4aea1fb0fc019f679e185229db8b4ac8e2c42ef SHA512 f836776b3c0dbadaf416b1903472c052eab9fd6d2d14da99fbab6bb27f30b6ad70174e8d67cbbdcb65ad17fc502396fe5887069fc81382c043b80f4e4e7a729b
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
index b3b9f406c2a3..b677d553fda1 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild b/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
index b3b9f406c2a3..b677d553fda1 100644
--- a/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
+++ b/dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8.3[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
 	' 3.9)
 "
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 125be6c78cdd..ed107f9a648a 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,3 @@
 DIST keyring-23.13.1.tar.gz 59582 BLAKE2B fb39490ba857f97b9b89856059664dfe21495ffe651bb48ad4e2284efe3f3c7551d34bfb4c39518c2b9b5e31e61b91693301271750f4ec837567d7652b11e9ef SHA512 7e56380e7311a31d8703b9e3beb74a8c8ce026f6cf9e1792780d349f3db61f50a1905c7d509a7013dd7cb47428dd3c28c3620815f01d3c4dbd7f648e056539d0
-EBUILD keyring-23.13.1-r1.ebuild 1191 BLAKE2B cf1ffb2fc2ebbce8bb2f1049f1b0c3b6a10a99f2b5045745230c5b6219ca9e85c4f685c00399ecb65c49380924ee24ef7a2c780b1070bd0526e782b45388b1f7 SHA512 e20665147d19a662ceb1f80f5c075ef208eb91d954b2b28706c455a50a73ac1ee4694d03f83674e26782071b2ebae0ef8bb8592e106a5ad795ce559c3f6f84e8
+EBUILD keyring-23.13.1-r1.ebuild 1191 BLAKE2B c9c877aad084c1f950f6ae09eb8dfa41663fe69d2e819596ac1cc254d61f9ad3d2becff82cbf29474c79bc2c26c3c19d15eff58a6a8f46112e1c076c49871f76 SHA512 33503e159b3e97e155fb16633131e944116bb96100dc413da74a73abd93a7bbbabc61bafce275d85adb27f61f6543e0ef5cc3aca7cb29497992caabe5b00b144
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.13.1-r1.ebuild b/dev-python/keyring/keyring-23.13.1-r1.ebuild
index 438c633749d4..4e76a9b5963b 100644
--- a/dev-python/keyring/keyring-23.13.1-r1.ebuild
+++ b/dev-python/keyring/keyring-23.13.1-r1.ebuild
@@ -23,10 +23,10 @@ RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
 	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.4[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10 3.11)
 	$(python_gen_cond_dep '
-		dev-python/importlib_resources
+		dev-python/importlib-resources
 	' 3.8)
 "
 BDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index df347c063eae..b3474b17ec5e 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.1.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
-EBUILD lit-16.0.2.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
+EBUILD lit-16.0.2.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
+EBUILD lit-16.0.3.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230325.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230414.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-16.0.2.ebuild b/dev-python/lit/lit-16.0.2.ebuild
new file mode 100644
index 000000000000..4275151b428c
--- /dev/null
+++ b/dev-python/lit/lit-16.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-16.0.2.9999.ebuild b/dev-python/lit/lit-16.0.3.9999.ebuild
similarity index 100%
rename from dev-python/lit/lit-16.0.2.9999.ebuild
rename to dev-python/lit/lit-16.0.3.9999.ebuild
diff --git a/dev-python/looseversion/Manifest b/dev-python/looseversion/Manifest
new file mode 100644
index 000000000000..d737df99e5e4
--- /dev/null
+++ b/dev-python/looseversion/Manifest
@@ -0,0 +1,3 @@
+DIST looseversion-1.1.2.tar.gz 8393 BLAKE2B 4ed8bdf5b7a1e249a9a889d60e5604ff5027e924a10a686b7def882eccb40450564721ceee7adc3860c6bd85188c5fb619ad461fa9fd4f31c8ca09e1d49331b9 SHA512 476cc7b57a9eebdc1c58506f4c394db9a338b4b9689fdfa171aa736fabe62282438d50923a834db104603f09eea44197623e89adcda3121fa522a3fa40585a25
+EBUILD looseversion-1.1.2.ebuild 498 BLAKE2B 02f70f8789b4540459fd582ae9577475ef02571683c2d0087c2fcc9c5881a4329b9d05d963e0a54b6f157da7cd6e355f25b9e1effcb8325cbf8bd14382fafcd2 SHA512 899b60be3ac3ba465b9df755b79a91dd39f68b498e9a03148091e106d35ba89a6dd6a45b1477f678bd3fcbd595f36e27cba3fba7795f5f6c6a6e02790924d34a
+MISC metadata.xml 325 BLAKE2B 1b6b086fe57b559429ada64c6af357d23974a368099e98f48ee5e225ca1583d40012f549663d86db43f8a30e89c862f95cce069dff3de0a47f15223c4afba8d0 SHA512 241159588b6e9a18dddf398c3f045c2f999199aa312b8ad35f3ce64a1a338c6a28d7747095c818bd7a5bc7b3e1eb2504c7f3f8c6a2d8f7d40b54cb9de26b9e25
diff --git a/dev-python/looseversion/looseversion-1.1.2.ebuild b/dev-python/looseversion/looseversion-1.1.2.ebuild
new file mode 100644
index 000000000000..064ff7ee6400
--- /dev/null
+++ b/dev-python/looseversion/looseversion-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+inherit pypi distutils-r1
+
+DESCRIPTION="A backwards/forwards-compatible fork of distutils.version.LooseVersion"
+HOMEPAGE="
+	https://pypi.org/project/looseversion/
+	https://github.com/effigies/looseversion
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/looseversion/metadata.xml b/dev-python/looseversion/metadata.xml
new file mode 100644
index 000000000000..56ad4b03476e
--- /dev/null
+++ b/dev-python/looseversion/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">looseversion</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 0ac7a2d701db..0fa06f725d01 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,7 @@
 DIST Markdown-3.3.7.tar.gz 324130 BLAKE2B 4ecf804b81181a9895e15d2f54881544648939f2bb772b036aa84dc8bf57b7976c6ebdf8549041b39a303bd7c68c16df3c126463a8da19b3c92f99b420e9ffb9 SHA512 39b9f45939be9e842e90470307c3aeec88d1389439b0c7a0c5b39f6e203b51d3a52ce431c4d5c278f399552c4218fc1a619b0efc56883de50a9f300f42120f4e
 DIST Markdown-3.4.1.tar.gz 322554 BLAKE2B fd7c8b930097f9b1a52d210e22d49311579b952f758d071ac3105badcbca19f798bcb195cc35acbe6224e1f7ac916ae5fb1baa35b30464e4c243b08168007be3 SHA512 73b0006ac8aaf281a2dbc2c14534853dbb7ab26a620f3961975279feb83334b6868fa4bbcd30767189201a0c84e502dacd16783de3808393699ace0cbaab30a8
 DIST Markdown-3.4.3.tar.gz 322175 BLAKE2B 628f6808f16299f22853116da94d7918d19b6195981f591faedda6a2ad15751df2d1e209eff922ba921dc6309cf35b7b82968a0c444544b8014918c73f8bad8f SHA512 9dec3f9e13ae73c45aa23a9ddd62d8103af83357e2c4fe447f079281bf3917d1ff43d9abf1903aa146baa46249e7f83b9e5f05756862f0de068304d2290e77da
-EBUILD markdown-3.3.7.ebuild 1010 BLAKE2B 8cf3a755c94fadcd78e1f9045baacd9ac64aff4353a4c524f9cb27dc6595aceb76b940ead086957a829b8620ca1a851687f4ff3f17bf6105ecc82ae716059742 SHA512 050aa619319613f1d10e82543c338e67297588fae30e86b4c52b2a0c195e7f29d36d639f37b1c9064727b36f66e11be12170da08b50d27f79cbb27c1f9b881fc
-EBUILD markdown-3.4.1.ebuild 1037 BLAKE2B 85dc5dc1e31c94a97ad2b934aa5a9c3bc07230f7b9644ce3ea3c4fa534c228d91ef328ab8cd25fb98e424dca2ffdc9aab07337f32b5d0a39491c7168ee6b5f93 SHA512 40722476e5d7f8df9057ef840716e8be771509299a229c3e3ab2c0470f67128ad1a43a4e38adc818ea202237ba262158e83748698d1b17ba16e795f4b086a39b
-EBUILD markdown-3.4.3.ebuild 992 BLAKE2B ccfea20c6273d2b250829baaadce746d4beea8982c699c8ad4635478f70631662966cdc7bb74c4120599e340e74e3a5c2f55d731ec52ee6d38c913ef2ab336ca SHA512 7a44615cf5ae87e221665ce99a8e7437159dc500a17002f8b7b72bf9844f048679d2d3c095c59134d1dd2adea0f980a96ac9603794687645fd33294a13bded31
+EBUILD markdown-3.3.7.ebuild 1010 BLAKE2B 5508c73fd032296e7507ebaf5a1043b9fc42e6216f7f91e5546eae5e114a2fde922f65439f54749155e34680ad92823bd80f721e503286599d588b1ec282fc51 SHA512 1096b1055b1de4a0db96a7608a0f512e83a1abd88f6b1e3863f97e55eb494500430528b420b9bc6692b02bd35eae63516b21b9a144515aa0d504d0baca3b770b
+EBUILD markdown-3.4.1.ebuild 1037 BLAKE2B ceea4c45ad9031b38308cbc85d30bdad4dbfc5a045e8d7799f300d9ad6cc6ff5a663e7d3d26d5edb3be059ed44b85ab2e9fcc128ad085f7074951a05c7b92c47 SHA512 06c8d78bca4b6b62fb6ebb8f1c557b18c205e03f96594c0b9fe6938a5df2183cc03a2823aa77b101488b659ab95b605310941e391cb76ec0cb74a205ca848ce4
+EBUILD markdown-3.4.3.ebuild 992 BLAKE2B 652b247864f10e18ccf678e7be30c4cc63d0dbf26bf75202c82755a531061ace1177fcd7cc35751951411820a45e296e4b2bba026ece445da463ec5221d79c33 SHA512 ffdf945d2fb0fca7b283332d11e0142ef24470bf138419a1e4778941a878dfb7324640fc840e1999d7e2743bd6e9421135d8385c727cda7c6427bcf130ac0227
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index d2c1b1b5ef7a..8eac151196e6 100644
--- a/dev-python/markdown/markdown-3.3.7.ebuild
+++ b/dev-python/markdown/markdown-3.3.7.ebuild
@@ -22,7 +22,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)"
 BDEPEND="
 	test? (
diff --git a/dev-python/markdown/markdown-3.4.1.ebuild b/dev-python/markdown/markdown-3.4.1.ebuild
index 894358a67370..f4bf4a2ca9a3 100644
--- a/dev-python/markdown/markdown-3.4.1.ebuild
+++ b/dev-python/markdown/markdown-3.4.1.ebuild
@@ -25,7 +25,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 BDEPEND="
diff --git a/dev-python/markdown/markdown-3.4.3.ebuild b/dev-python/markdown/markdown-3.4.3.ebuild
index 0c3402deb09f..9cdc1fa349e2 100644
--- a/dev-python/markdown/markdown-3.4.3.ebuild
+++ b/dev-python/markdown/markdown-3.4.3.ebuild
@@ -24,7 +24,7 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8493014561e5..aa224e382686 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -16,6 +16,6 @@ EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B 40e9e41c4c038b05bf7f9a8e02350602b70d
 EBUILD matplotlib-3.6.1.ebuild 7283 BLAKE2B 88e483a6fed18d9d4db1e11f598f5a66b333451cbc7f7b813a43a19c39abd096751458cf3030c32d2e2c4a9b8cd6f1bf3d5666470272f49a5b1d1203b3a0ee95 SHA512 a325c49c5b99548bb6c9bae8b9a917473987234d3aefcbab7083c643f7f00a48b7e2390baf927ae177ec5e961e7dffdf5cffad79339211cd7c3a013d93841150
 EBUILD matplotlib-3.6.2.ebuild 7371 BLAKE2B 97be1fd479d20e214d8d9264affdde51be5f69ebf72b19b8a15791a92536234ed2af6b84fa3de8f0c0fd11f47933fabbf761daa7d358f40a8daf9e876649972d SHA512 7881b796355c0a4844c86d84e0e42e3fb0e8c51f1e507a87eeb121136d726e5cabf5c1539b43b0a32eab3c405340d9c763cb5484de59c57c0d5887d8330c698b
 EBUILD matplotlib-3.6.3.ebuild 7416 BLAKE2B 12f2e64da9cc348d1c0c5277a851a3fd6accc168743eea5fd34127efbb6f97df73d78633f82550f505155d8cdbf3768d1c4a9daf3c7252c348566986a68d4562 SHA512 a3025d7f4fb5f99f9ae34189b8b66a14e58952d3a5b25f24bac1237f9bc603d31766164bc0a20a1e24b0c0410b5bc3db1e707ade7b7c30aee977b8f0fba549e9
-EBUILD matplotlib-3.7.0.ebuild 7518 BLAKE2B a1cf40163e66bd3b5cba7eb0bd449710b6baea8123c7fb87a66b7c2469cef72007e52782dae611ac06ba3a97d816a3a9dfeb8b00855082f8d634dbb365a58fc5 SHA512 158382c375983b54acd8ad0854b80e62752d25d27e5d54d59d15391b97f303510c82437c5f4723811ce40fa216199a3f9cdb803e3c84ece1ec0034022be702a7
-EBUILD matplotlib-3.7.1.ebuild 7518 BLAKE2B c3f5ae4c89735daf794e6cc19e7eb4b2a3b6a745f06a9d53b5321726b21aff6c46812b9007acafaf2951b4f575a750ef255387c8c316f36a19b9fdce1d82c337 SHA512 9d55a0bbefa80a155920fc17c6979138dc31c1bf129c8b9c1a8d5a6b8e53c08f4e07bd88b9a2f1e79c35a4272d68244058a8b5ad095bb374f2457a7b41af849b
+EBUILD matplotlib-3.7.0.ebuild 7518 BLAKE2B c61e34885d90f17a0f35b13224f235b43f54594af457962291036793021e55113568fa2d08a7e48a2d4c92aaf338fff32fa5785c56b353314e0925242b36a65d SHA512 a19a8db3459895d294800389bd35306fe7fc96cf1c8f411d7e9fdd7021f0ffc821390bc7db160737bf3297d23e739eaae5e6ce6c68289371fe5527e77c0f361e
+EBUILD matplotlib-3.7.1.ebuild 7518 BLAKE2B e3133cab5839386a1aa4647741eb1b2e612749886569a7dbe235f3f2aacfc58736094e3e38bf7363f32c12db46e91d076419502161e30257819da017dde7119c SHA512 a75f8656d378981f2e98f2cc1e1681d0701f9e3b32abbf9a694a391f48460f28699c7e3a80a188c7bee4779e8df33bc7c1720370b7f4e6fd65964fc586fecf3f
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.7.0.ebuild b/dev-python/matplotlib/matplotlib-3.7.0.ebuild
index 2f7921dc4a9e..3b74c8223639 100644
--- a/dev-python/matplotlib/matplotlib-3.7.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.7.0.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=media-libs/qhull-2013:=
 	virtual/imagemagick-tools[jpeg,tiff]
 	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
 	' 3.9)
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.7.1.ebuild b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
index 950b499d395d..11008e4e4aa2 100644
--- a/dev-python/matplotlib/matplotlib-3.7.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.7.1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=media-libs/qhull-2013:=
 	virtual/imagemagick-tools[jpeg,tiff]
 	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
 	' 3.9)
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matrix-common/Manifest b/dev-python/matrix-common/Manifest
index 6f333690a080..8b6f0336a45c 100644
--- a/dev-python/matrix-common/Manifest
+++ b/dev-python/matrix-common/Manifest
@@ -1,3 +1,3 @@
 DIST matrix-common-1.3.0.gh.tar.gz 14143 BLAKE2B dd72a7c5558c2db0ab38f2f544f6ab6926fd037e99cbb774973f08bdc661c1587d3d6883ffc6a9cfcea6942284d4020814c02d56be3746279323fca17490f434 SHA512 d08fa11a4156a7c4596ea20709e0fddd1563ef1f4ba763e21a073ba53e1baf58d8de1b60cf0f69c846128cdd6f04788df49765704c8adfde187e8de1dc5ded4e
-EBUILD matrix-common-1.3.0.ebuild 695 BLAKE2B d3eab1510cf742fe578bcb03bcd1596cf269642d7ae2179ce116bca7f566ba6de2d7e4c0230d743ac1dbe4854974a975e8e3c368811336c5772f35c4e8716ef4 SHA512 2e0b71a91c38dd7d50169e2fc704737623df1ef5117e8458f81b81dd7fb679489e7cfd8303f894b713e885a19c0814198fed17c4142bca4e004f346bf8c0dc73
+EBUILD matrix-common-1.3.0.ebuild 700 BLAKE2B 3a92c4c91d5c2042c3f816a6b3a019cf7721e2b2860e136be4f154fc32b6f873d1b8516cb1e05b2d8344ffcbc4039a69e822b85f11b4a6a4dbaf8003e2eb999a SHA512 899e58e3ce03c0ef2660f540e944b74e1bfa2773999ebc76dc80217f664d199a4ad3f289b9bbdb93f5106576d29f143b4e46e56c4eb1d0a912be37b6b5660bc4
 MISC metadata.xml 562 BLAKE2B fa541a0975b17ed6cd5da5f2c2afe5c938e4e9d6bcb678ff73041d0868fd5c3f113b25a5e1ad9ff12179aa4ede1ecefbb74e92946e6fb142b1e1f3bd14aca4d3 SHA512 83588db4905f80df6c8d881e20753cd52de1ee828d3a8650cbe8806692483e54fa0a126dd5a69530d1f64e6abacf0c75e4b128a8162a9a76813c6b519c916795
diff --git a/dev-python/matrix-common/matrix-common-1.3.0.ebuild b/dev-python/matrix-common/matrix-common-1.3.0.ebuild
index 6245d546b3fc..fd8a94e1ae4f 100644
--- a/dev-python/matrix-common/matrix-common-1.3.0.ebuild
+++ b/dev-python/matrix-common/matrix-common-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
index f4b47d9bd303..89a6d30534de 100644
--- a/dev-python/meson-python/Manifest
+++ b/dev-python/meson-python/Manifest
@@ -1,4 +1,6 @@
 AUX meson-python-0.11.0-defaults.patch 608 BLAKE2B b4c8d87a766495ee644830dd98903e512e052ccb0c31b75ef755b2b33cc7b912ea3b232b66c539ec3da8d8d77ae90b04a87cac8d0c55cde4c00c0f32ca4cb001 SHA512 f814d2c93bdb14e245b83eb4a94329875ccaed2f9a78fb31ae5c5bc5b778bd25b22b097bbc5dbd810029b9613a2532d1ab971c8bb6c60cda41ad6d1351c9e93a
 DIST meson-python-0.12.1.gh.tar.gz 43855 BLAKE2B 96b9ff5ef628bb471f7f79ce30ec6f3f851ce0006327e8b3a6003fdcb768f3280c0ee882d1c0c8ea183b0f2319d7c977c3fbb62742e3127bafb73e9732b3a1a9 SHA512 6f8e840da0155f2dd0e7139387f875cfad79eb042abcfa69b3043f51cbae3222fc2986e13798389909a0b4719513c93af381ec00a69fdfedf14bbe4e100b2f08
+DIST meson-python-0.13.0.gh.tar.gz 69373 BLAKE2B 439ec0fcffa5398ec400c492bc7719030981605c885158fd477e293b62c6e0eeaf3eba0327937817c20b7d23141749ff4bc71d12a67dbf3473168555cef97918 SHA512 2d319090f77daf5c1bd2a922e50e960fb416008ec60f3e8956ba4d2a29c31129e0a0d864982e9e1c0d6b7659d107e5d90d4a540d84f56cb2a8f79f013d4f14ae
 EBUILD meson-python-0.12.1.ebuild 1448 BLAKE2B 595ca91b469122beed8c6e2d488e633600e7a6129396743caea311a40bf4e07d49c35f0a22627ffa342181e6b720f3746cb9e7d3e22935added38e5e7969cc04 SHA512 4884d03dc8284c9aae58b64f6e54a1bbbb57ef561d85d8be009b26371c3bdf08a29698d1feb749fbdbdf3e23ab621eb7b1f8182bc7cc2c4c870be3ae28259665
+EBUILD meson-python-0.13.0.ebuild 1360 BLAKE2B 76a9f4f74aa12d77efddf86148d14f867154b7903acef0b47cd603a45f44ec7ea675b056e55a7b2da40460d1736ef139951ae5637625db30912c3180d29eec9b SHA512 e5b966caeede89663dd63dbc9bffebfa53cda6dd105d237d40e248f51fca6b7e1527d8243c64baff4f1e38942458410123545c98ced0731b50ded181f52c1ff6
 MISC metadata.xml 357 BLAKE2B c2b5fd8c6ad39e92970a5e6c1db8950b4850660c9a95a84063504ab75e5dd69e3ab844fcef23cb51f33493b7e522a6d26227ff48dd893c92c422badc70f3c962 SHA512 1402ace4da543de7320a1d97f44177593807d5be9f1891d8a53190581877569508c46fe6b4ce63516c7fee2d2165d59d39f44343dde18438570883da3f4ad28c
diff --git a/dev-python/meson-python/meson-python-0.13.0.ebuild b/dev-python/meson-python/meson-python-0.13.0.ebuild
new file mode 100644
index 000000000000..4ac32a433449
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.13.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/mesonbuild/meson-python/
+"
+SRC_URI="
+	https://github.com/mesonbuild/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.63.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+"
+BDEPEND="
+	>=dev-python/cython-0.29.34[${PYTHON_USEDEP}]
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+		' 3.9)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires network access
+		tests/test_pep518.py::test_pep518
+		# requires git repo
+		# https://github.com/mesonbuild/meson-python/issues/397
+		tests/test_project.py::test_user_args
+	)
+	unset NINJA
+
+	epytest
+
+	rm -rf docs/examples/spam/build/ || die # remove artifacts
+}
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 6718ad7bf568..e00ed36bd2b2 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-1.4.2.gh.tar.gz 4018656 BLAKE2B 325e940c72f6a8fe7f353a4ba2f65fc6b123c5be04173e5469d3165d25b3d6bb8983b5c541b0d1376770a8205b54860b756eca1719decdd77e7e4c57477998e4 SHA512 cabdb86a5934672645e29055c04f5c877dd5527df909a606d94f930211cec9f4f29f89137dd413238c07af4108d870dd3b880cba447c55690583cd1b13b179b7
-EBUILD mkdocs-1.4.2.ebuild 2433 BLAKE2B 24a4fadecfa79b964d4867c1e9572812daa394add8822bef76e68aff9adaa6f4769502df62ff405e14a786d26216d992c46bbdcb448a2f482fa3028691b1c9a8 SHA512 9c6aecb179cf051944836a3be941bfe3fd2c42117759ec3e90a7a96c7d7b929da29771e2e5dc9596ac951f9aa5b7c96983697336b53c99edc00e1bfc97451b61
+EBUILD mkdocs-1.4.2.ebuild 2433 BLAKE2B ad914ff3892c41d25e4abf25d44fe26fcbe1ebc78ad455101d3de63dce8d04061893a0d4799682565ad58e190a01b5545aa3505510483ceecfc73c3500abbfd1 SHA512 b9d2679d088fd374fc8092e9554894a181f635a8e5eed0950fe9348028d77822bfafb231f631697f41918f812ccfcf206ee600c00589b7b0d6bf53a78b9aa3ba
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.4.2.ebuild b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
index 6f956222fb1f..9465fb8d43ea 100644
--- a/dev-python/mkdocs/mkdocs-1.4.2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.4.2.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
 	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.3[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
 	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 0c648d9e3ed5..9cb8e4466018 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,7 +1,9 @@
 DIST mss-8.0.3.tar.gz 87005 BLAKE2B de2a6da2b9232a14c460167fd721028684b580a9f57c13b90d101e644f73055c0d10afa727e6cb21b522634b7f2f1f3c657b5823a506723d3c7621c65d174ce7 SHA512 0397f4bc96e5fe4a8935a81ba63ab2e2d6cc20876fd156350a4bfa9ac0e928e357857729c9231c6ead5f091349f7f1b51fdb3d772621bf2dc799c5ca60f28b21
+DIST mss-9.0.0.tar.gz 87286 BLAKE2B 895d06afe334649f5ba3bfb6872dfe4e0d04bbfdc88cd7fd54a986566fc4696b09c257c3f53c3ddb9467ce9d248e5dc533b806da63813180d8f1475c78035968 SHA512 2a1d0c522f8ab8023df61ccbe70b8a644474ba91775b1450522dd265ce544c1d04bf855b1ee1ddb5dff7d82229394447ae1eac359ec499c7afaf70e35321bdec
 DIST python-mss-7.0.1.gh.tar.gz 91121 BLAKE2B 67061500cf751b76d8507b164f17caa028261a5a52107603249cab4634205c52518231e0038428cce7a219effcf07a951056ae44a09cbc2dc01f10aed984db6a SHA512 efdbfc94a1218842db109e2dbd0659bb426a958050c9a3dc5802f018727bcbfeb3ca8dec6bdec914c894f4153cbd1994cd3ad976435407b271d127e957b1fda6
 DIST python-mss-8.0.2.gh.tar.gz 84555 BLAKE2B 6ba192a08a03a18aef8d2a749e363fb59fadbaf2a6c7c3368f6b23b1d2ad41d63ea4dffbc3e978315fdc7a8f5a774c1385ca8209fb94b2b00734126774b2d8c5 SHA512 6c43d608743dbd2ee25a94007ff54d9f3b984c9e9d2932191ea2d9ed3c64e3a969ee09b6ff0fb6a36dc3da3b3c26a9a0624f8f84556801902d6716e9a8236ecb
 EBUILD mss-7.0.1.ebuild 990 BLAKE2B d5fbdf943d7bd4a3b8f4c22bdf8b1650d3cd7b2961898e9784a8f31c916a6f1d52cfcebbf7a6b0f04cc7483da9519ef5650cc9ecb0290005a5b55d7afbb5b26d SHA512 9099a473550427979f7e6094b501f06c3967bea9604a47778f55b4843b094bfc0eaa4a1ba5af3c87d8f94f757ff193f9de10edbff2f06b11c3636dfa76e0207f
 EBUILD mss-8.0.2.ebuild 1215 BLAKE2B 5c820652769a8f3fcd231dba017158ba0df3065445e59abbd0b38d47317c725e8e117ab1e6a551edfc5c76ef8b009b5e465cbb7a84962cbd6943295d3a0f2f42 SHA512 d2939be11084b0057e742b782407f4586b45467b670aff88cad24c1f9f2297576ed971e8732bc4a33342673df5169b62785b07bebfa7895ce6b8626a2d2291c2
 EBUILD mss-8.0.3.ebuild 1004 BLAKE2B 84e261eba5bde1ca3d44b7eea5126e67eeb3438d50f13db9043ae87bd721c59df4ba305b4b78441f9f9a118aef87cd13398fb654d4ea967c437855c37b66cab5 SHA512 829d461e457c2080027c29d11f98b342fa9101734faec581fb870e2d4906b8d6e98f4f51ea10f798e22cbbf85c3a2cfe67e754f9a17e69ea3b9ded2bc6b3da1a
+EBUILD mss-9.0.0.ebuild 1040 BLAKE2B 4245bfff5365a910f3294cb670ea33aaffa5dbbfb2ed4284f156a815b4d5c16f8e94d49a938fbb5c4062ea2e877ab17f0f6267620cb239ab1a092f1f3cffebce SHA512 195f631a92fe48c3901ecbae513c724f09466d3aec8ca28fdf15bd5098f63c242b56de2186cb55a8e59fb260fe225c3c6a9350060595ba1ab0c02dde907e9670
 MISC metadata.xml 389 BLAKE2B 0bf17290bb77ee34c59b8db547365e13ad284fbbd8468078995ac891450453a15920e188d75b9f8aed14319ce211aa968d10d0d38c7347a9c5269431bf290f6a SHA512 468c7ff3a88f5d8b2efa646572ce29b45a4b2bc1bdb1a7f1cdaa841b369caa53e5a3d8fafb01b310505d50d9d12b8a725a5c9e926de15bd377ea07342a681182
diff --git a/dev-python/mss/mss-9.0.0.ebuild b/dev-python/mss/mss-9.0.0.ebuild
new file mode 100644
index 000000000000..5f9998b05e09
--- /dev/null
+++ b/dev-python/mss/mss-9.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
+HOMEPAGE="
+	https://github.com/BoboTiG/python-mss/
+	https://pypi.org/project/mss/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+
+EPYTEST_IGNORE=(
+	# upstream tests for self-build, apparently broken by setuptools
+	# issuing deprecation warnings
+	src/tests/test_setup.py
+)
+
+EPYTEST_DESELECT=(
+	# unreliable `lsof -U | grep ...` tests
+	src/tests/test_leaks.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index e7212b79afa0..1b770fa1b588 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -2,8 +2,8 @@ DIST nbconvert-7.2.10.tar.gz 870708 BLAKE2B 837b5cf70f530b8fd3d566809d8d4faefdb3
 DIST nbconvert-7.2.9.tar.gz 870386 BLAKE2B aea62f29d3e696c70d77ab73cc89347a4e0c8e077e98c45331608f7117fb3c98165bf3da89e4f3bf23b9d62c618289d98c9103c5b2998ca81f65cbfda65ca536 SHA512 0053e0e88f279d2fe430e516bcc19f98191e9ce414546ab1ff214f37c8f1cdfc4fc101faa4b5f1d5955fdc65c87aad367f5a5f12ce5991c68c015c5083f2f30c
 DIST nbconvert-7.3.0.tar.gz 879918 BLAKE2B cf1414f5c6a41222f576a66ca8aa49f98d5ee4a0cd6bedcd779a6c429d46550e0435e60723255358f1ccf51b508d74e7461521889cbb7e6dfb10377175ea78a2 SHA512 a7030cced31ae749d9625f7fb7cc2bee17c10fcd90e83f36efed1c00758d02e47ed9d90aa907c2acbe979810a561d48d9fe854a3786b60418beacdd471b14b8f
 DIST nbconvert-7.3.1.tar.gz 880064 BLAKE2B 0bde4a65f27a880fdbf694dc6501ad1d0f78bf72e6010377faf89d8b16d5b24f82fcba93c51d9421a88e5c554bc0fb6d002f913886bd2d2f1a7f17a834755d02 SHA512 24d8d0ff35cf09d095d01122386439cf0c40eb9af7c88604f3108e5831a270509e1302370dc40eabc8bcb28fb86603d9d7a4a104346122deb8471aab7471e62d
-EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B ee3637497b8cdb094e1835351557e5cc4d812afd2477c927622675b35992ad410a04b6063726d1a2c87dd5bf3b270b1f29126337995d95ac52cc5dc6ef52c65a SHA512 9a73a478676ba76c49f34067d2463f9b8e7850ad12dfc9a90e4781cbe3fad57adc93fd861698653ecc685e787576cf3674991bfe1796c5d5f17414f5d814cb51
-EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B c08f33eb7514987f6db8f7c44f6373db76d6e278d015edd7b161ce08b71304251365299bff55f87457bd6958b4e3549f49c66d9cd8bedd74c35999a65865d588 SHA512 354b2b3f32be7c71b9b285a205a3df8848b32a140eb9c1ebada1ca8679dd84c73556e1bcb10f74ae01e11d97639bddd2aa444f91acedd4802cb6efae966238bd
-EBUILD nbconvert-7.3.0.ebuild 3052 BLAKE2B acba1d6af5f625b9b994bb19d369dc6120362eb271d5220640fb86a44d1f010fcebb75b111932b72a12d0bf731f642360ac532a0133fe9a9c14a375f9f9da282 SHA512 081a937315536a13452893012b22f0dff87f84d4f60004aea246132bb4899a2cd0979066a668e8df093fb03230dedb0d512afd1d37e0e17888e65dc0cfcae801
-EBUILD nbconvert-7.3.1.ebuild 3072 BLAKE2B b0bc2cca425f3b3e6e3a75b2015898bbbf25e72039866f3e4b16ac4e79c62b57cee02f09d7a1c81ea3ecba554bde56bf7f3cf728191d3821514e0cd9f53aa5e4 SHA512 d0b2cfd91a487c3ba6f61aa8e04056e260ef6edbc6c58c9e5b1c35d74fdd31c2cd9db46e9c7f27cfcf56903ef5d8d3452139d0e99995f79955d4db0acdbe60dc
+EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B 0b8f02f5d55b8b9576fe42f60b19c6f6c0034e0c6beb362b05c74983eccb8c21ef84463b5858ffa3be824c7b00953484568a6d4fb49f7dd288f447c6ae8a118d SHA512 d262250d0c3c8fd474d9aefa7c9dd3bc5f641cb45f349d144fdc58ad4a943dfff2f9c77e6faa8246e136ef9d481572b38eaeb2538bc78fa45f9984e6a18f0645
+EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B ae75fd9fdb5c4b98fed9dd0d7d5d4120c26a1c38f33f751520f03e84bf2b6f00c1f8944afb2a6e2ebd12cb387b4b48e894499d6d249d4261324b6358a42cab54 SHA512 d11e67fa0b8de167b86a0d4f850e6fa805631fe47a4ae40498e6eba6a8b10c5c8ccd8904a7236801b39d9d41b0c021cd534e630076e3954fb8acfc1fca44769d
+EBUILD nbconvert-7.3.0.ebuild 3052 BLAKE2B 449b005463d8b9fdf5fbf632b902ebdc07e0f1335f711b18f00e1208d4640010d171b6b7bf0bd0517ec22d5568e3ca29e25e99085975a4a78f4e6b1a5053bf62 SHA512 cad8084c5da7e143bd6611b0e9f0a4b16d09c6bb459cac212bef0d5ba17dbc193c8826b1b4ac6daadbab96a556ce852302920d48bde8e1af879e81d598e5a411
+EBUILD nbconvert-7.3.1.ebuild 3072 BLAKE2B a66c85bc5237b3f670b1694f24e5d940c8d630d808852b087e60e2bf9603f2d6f3ad82e4e26bd10ae5b54843ee1f49c65710898dec931ae0d8a74c211d1eaba5 SHA512 f145b2a9531317b4e19c26386541db87a2bdd434033b7a6c05b00656bc50ddee180942ff6c09146b4a616486e346fd0b975c51c43ab2701727fc8f15717a67d3
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
index 246ad4c16554..8a9e062190f1 100644
--- a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.2.9.ebuild b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
index 82af77a2e7dc..b2291dac10df 100644
--- a/dev-python/nbconvert/nbconvert-7.2.9.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.0.ebuild b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
index 5f78072d38d1..030eb09c5ff6 100644
--- a/dev-python/nbconvert/nbconvert-7.3.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.1.ebuild b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
index 77c4e2b2a1f3..cb241abc93f1 100644
--- a/dev-python/nbconvert/nbconvert-7.3.1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/bleach[${PYTHON_USEDEP}]
 	dev-python/defusedxml[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index b355c5cacc62..072801cd78de 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1,3 +1,3 @@
 DIST nspektr-0.4.0.tar.gz 7734 BLAKE2B 66a52f5080c78accc75e2193dab6d07a6257330f9938ac463c160d7e1f9740294416657193e5831f564354eb0dc3112a9ab41676e1c928ac40769d2a4d218089 SHA512 c8e8dcadd3ccd49bc9b1a38d2ff9f1d8d6f85665d3830cc9d7975ec1c63b1e2f1a7a64e12457701ca658e2e0e30cac7652be6d706a4e47ba6a61ae76d9be8875
-EBUILD nspektr-0.4.0.ebuild 1531 BLAKE2B 6e50abe8d0eb8d60a3a4a81b9d2494237e702887922f6f156656ed10df052fe0cb41b47492c3c62415235c9aa4e478ebc7b04468cd90fa9cbf3c7ef9d09957fb SHA512 c750ae22b9c5b996b7c2d23760f57ad71a5e83bfe47e09840a5daf33ef2075b4c141cfb4b1c9a197532ba1de3cb6785c213d13dfb5d932ea3d92efacad10ee80
+EBUILD nspektr-0.4.0.ebuild 1531 BLAKE2B 9c7afe30616336ed85fba306f5685ab0ebc1debd92b77e6c93502d6a1208bf979c61e6676a4246c1419e4931edd7018794d68341a6118bb2d3bf0fc7dce30dbf SHA512 6cdb86f14c2dd572a31abbec06df3cbde618c4ed4597f5d706a922e24864efaa7c8157aeac2578a57e8461aa3cfb0a9f90986f9e3512262cf71b5615561f778b
 MISC metadata.xml 367 BLAKE2B e0c1c36f285783d80f298d38d3821fc4aaaf81b83e2a0226972105093406446426fc7e62c3a92138ab2a925e04d1fb58744cb3d51b62941b1118d3b3628aba71 SHA512 bbb3c37cf215be4b8fa83d0c9a592acc3dbd60bab0afeb979fd343b80c6b71766c155b94f7fd8a9f835330f4038194c9bed0b91b2bcac94b1c75409f92f5c9f2
diff --git a/dev-python/nspektr/nspektr-0.4.0.ebuild b/dev-python/nspektr/nspektr-0.4.0.ebuild
index 09339ae80cd6..feb50f9cf33e 100644
--- a/dev-python/nspektr/nspektr-0.4.0.ebuild
+++ b/dev-python/nspektr/nspektr-0.4.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.2[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.2[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 "
 
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 88bbdbd2dcf8..1f440525e388 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,3 @@
 DIST openstacksdk-1.0.1.tar.gz 1118637 BLAKE2B d4677a3a5595bf871fc0b380f1cadfd56ebba14bc2255fcc6a6a4813c5c79807a1a0a76263844728f256704b2966b82be9bd6e968de9e7e85f411402f428cb78 SHA512 9871a262113b4396b3a5181e93d2e00312c5a80933c3ff6efa501a4b4d7d145985f54203eeb6e1f50c5593ba491b13a631b9293759e0615bf0eda393c247a4d3
-EBUILD openstacksdk-1.0.1.ebuild 2635 BLAKE2B fb8d35567c037c5b6cae1654bdb233e5e4d7e16abba9eb22233c8f7983c322320b53f9f7fd80928ff0e7ec895f614de2e7150e8fcbc51d2b5a0eb3c6be27b0a3 SHA512 8f10c9e24543f5d0747341b47c7532434f453ff4599571418a9ee340032577b0c50e152257049a492f4ea384df27c55b082155ab89776dd6ddec11a65598dd93
+EBUILD openstacksdk-1.0.1.ebuild 2635 BLAKE2B 2b40af12289fddb05740019b0d11499dbe91983e60b4a3a979c0e61bd2f91582d89a8427976e9417dbe893973cc4dd3686078be9517db30c200c7b2da5647ada SHA512 58c2f1a65318f976da006ea77dc00d1ba4cbb6dadec8738972d21dec668f8d943c088e4cf5d64719b21a4cf37600155595af2fc1a1d26abf1173de211b8bdbe2
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
index 710d61c3f463..8bc3e8779f00 100644
--- a/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
 	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index fd5acb4ea9e7..122db8c3f6ac 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.config-9.1.1.tar.gz 160964 BLAKE2B 180b76d9425b9be72dac22379618b69265ab7016044ac81ed826134036aa988d867882116a50597df62b702bfff4460ac17e7c1d435ff9a1f0028a2ff64b7a2f SHA512 820da069642a663cad0787ee4e100720dcc9870faeaa208c8aa5be5f3c6bbbf1e5e3d2cb8c5d86765fd4114744e2fd1a00902d79200ddeba5fcec2ed61405e4e
-EBUILD oslo-config-9.1.1.ebuild 1567 BLAKE2B 41cd50a123e21849c44799d6d45fa1d5fb4ae6b3f19626c86852eb8ff5221fa825b065103803ac591c82ecc3504e605d71288e33ed3e926e66384175002c970f SHA512 79f2aeb9258e5538314f35fc14b885818b596242c3d5620bde4acec69cca36fcf97c0e5d02f68d51218a2a965260ff1c3bb54b388570c312e2e2d20d13daabc0
+EBUILD oslo-config-9.1.1.ebuild 1567 BLAKE2B 43033d56a25f3489f8137fbaa3e8ef48414984d3afb556f7c66d0e8e210fd2ad335bfe908304185ad66730fe13b7ed97d18288162ad4f63ab753f2c34a8280d1 SHA512 f00dd9e72666cc21b6a7f658e9a1fa9400945072b550ed0b9715013d1b900868e82acf79ac51b0a45193ee20a6a9b8331b6c1bfbf7e829c5695111d68ded4966
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/oslo-config-9.1.1.ebuild b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
index 1174ed7064a5..fcb6357ac116 100644
--- a/dev-python/oslo-config/oslo-config-9.1.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 9d26904bde47..9f7754879cb2 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,5 @@
 DIST peewee-3.16.0.gh.tar.gz 1085430 BLAKE2B 3acfbbc9d8cce7e4bd1c0027905f4ca44431f376a243adffbfadd4d3f15b4e729c4736076e8ec72c40261ca269c66d811afb6c25b9d075d5913a13869da4f4dd SHA512 f77a040831bd3189135196ede9748c92af9db21127839dfacd7712586273bdd22c688ca22bfa373805fa1b64f770b7cea850cba53e73f324f25ced1305830409
+DIST peewee-3.16.1.gh.tar.gz 911668 BLAKE2B 6336d2edbf85b54dd98b3a67fc9507c626eee1d85293b12cf60d3a733d243d70a7df0583cd6024cb0550f8f31229702404692b0bf588e3c46e104ad64a095f37 SHA512 e89f1a2f25c2675403a560d3fa8eade833f9ef8b2fecfef00769a9633e99cb40feff7c4e1d2e9b001d4e6f50a8dae4594ffe22adfbe64a93035c47f673d5557c
 EBUILD peewee-3.16.0-r1.ebuild 842 BLAKE2B a41b4404d296d80db3493196fca07b26649be969c3a4433d0cd6317d74e5d549bf88b8b7bd64a5a9f21a8c68eb133f5848e3005f0034f3731d59f1d023810735 SHA512 271075fa89d8f5f8f0f2a644917fc70329773bb3f8d6e8fec7401689ecc831b65e9d825debe1d6cf1085ef4f2f46de99066b9b60e727637feeed4da4e997a0fb
-MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
+EBUILD peewee-3.16.1.ebuild 996 BLAKE2B 45fa48858be3a4f0678bf17e6fa4c081d59cea01d3c47c8627fe670a83026aafd11ff7b518dbc986a872697cbef75f33febe815b2c78561a5152dcb4d7ceb000 SHA512 2b5bbda87c65adb10542810be4a2becb72e1acb8d8037ad6468b34c93f3ed38c43ea59203d1fee38857ffaff6038b31fb497db4e48994b7c2722f71a3bb213df
+MISC metadata.xml 493 BLAKE2B 60dbc97d8a2acf239b6ae84ae48153ec7985399ef588de5fd3d5e06db137353ba8440eeb811fe90edb66aef70550c514c23f53cf8ee2c5e8146504dae71cef19 SHA512 28227e81ad41534f8dc80dc478cb72e116aa3d5259bb91dd20121fcadd803a04715a986e21d4302a0c8129a4fcafbd71645636b0e5b3384a661f3ee93d41fde2
diff --git a/dev-python/peewee/metadata.xml b/dev-python/peewee/metadata.xml
index 69c882d79303..f2395542a773 100644
--- a/dev-python/peewee/metadata.xml
+++ b/dev-python/peewee/metadata.xml
@@ -9,4 +9,10 @@
 		<remote-id type="github">coleifer/peewee</remote-id>
 		<remote-id type="pypi">peewee</remote-id>
 	</upstream>
+	<use>
+		<flag name="native-extensions">
+			Compiles native C extension for more complete SQLite3
+			support.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/peewee/peewee-3.16.1.ebuild b/dev-python/peewee/peewee-3.16.1.ebuild
new file mode 100644
index 000000000000..5ad5f5f37042
--- /dev/null
+++ b/dev-python/peewee/peewee-3.16.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	native-extensions? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+src_compile() {
+	if ! use native-extensions; then
+		local -x NO_SQLITE=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index d1e57434051d..c59eb64cfee0 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
+DIST python-phonenumbers-8.13.10.gh.tar.gz 4910354 BLAKE2B c78fc4159fe6758e9fd1afb9acfb6d0d29878b599b0c151e5ad02221fcedd7cbafb3ceb479dc95549776da9fa896a09871677efbaafb5d5fde2bfb19db9c4780 SHA512 08b09903e3a84324b6128b007c1a805d8c9e5216afd4c72b25d71d2b62719032c373e53b663303b9ae2b90465214e36141050467a860d187e826ee76b1a80445
 DIST python-phonenumbers-8.13.8.gh.tar.gz 4910864 BLAKE2B 33babe7aa0f487398311817fa901a56ac8a7470f2e4338700529f35c7622cf9b663bd404f6c1087600c03fd2844a1c777ed81d2e61d9cc2f0ff78e68a0276624 SHA512 6e2ee96aa9c20188b276cdeac1365fddb339feb63e8d5e9f61ae82f6aa19cc6564a5f1dbf687d6cc69c2cfa21fbb14892f880677ac7ba734a949183711faca5a
 DIST python-phonenumbers-8.13.9.gh.tar.gz 4910883 BLAKE2B 596010af1526a4058f3db8ac1bb087d59dd93d1223ad54c50444740c3b6eb0d0ee4da83ec2882140f3325740575bd808ecd9726b9d583420283c25285cdd32c3 SHA512 24ae70a9d6b5830261d719c5a003ab6909ef9b759c53bfe7e78d7ad7062ad878bc2109b92041266ecd798b92d94392b53d02c6f51446e88d8c20dc4b48a10b4f
+EBUILD phonenumbers-8.13.10.ebuild 810 BLAKE2B 1cf55707f2e04cf211a46c748fbcd6f59ecabca31907fd7c043132ea51035a8164d1acbced3ebab8cab02ea2b72319a340cb2d4716e8a6c4bd6dacb32b4903d3 SHA512 57a7056b22c929f1f54469220b682dd6c6bad1cbe9e50c7e4593aa285641e9abab1ab9cb9780d04db739a24211bad398a7c749d4adfdbb579ca027959407c07b
 EBUILD phonenumbers-8.13.8.ebuild 808 BLAKE2B 68bf5867fe33d7bf194dd170c9cb30dac10bc0886d9656936d691e046fc72025e8205214b14c350e95720de49876f376ee1a17965e3ae2f2aff592536a60af38 SHA512 720fe4917947d28d3c32a4ac9fb41d0c9be99bb213b9ed45e9dfff277d65a693cbe2b711f54856e7874254a742bca4ec7571c400eabbeb77f31a1af64bd93673
 EBUILD phonenumbers-8.13.9.ebuild 810 BLAKE2B 1cf55707f2e04cf211a46c748fbcd6f59ecabca31907fd7c043132ea51035a8164d1acbced3ebab8cab02ea2b72319a340cb2d4716e8a6c4bd6dacb32b4903d3 SHA512 57a7056b22c929f1f54469220b682dd6c6bad1cbe9e50c7e4593aa285641e9abab1ab9cb9780d04db739a24211bad398a7c749d4adfdbb579ca027959407c07b
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.10.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.10.ebuild
new file mode 100644
index 000000000000..20fb3f38daee
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.13.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 5dd34c8b8be8..e31483ff155b 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,5 @@
 DIST pip-run-10.0.5.tar.gz 32411 BLAKE2B ce633d003fa869f199dfdded46efb6bfa9fc4e24327cb99b0176d8e6e6bcff552c6f84589b77907a063fba3315b3f9c64d6c182d70dc39d59a1342ee9fe62193 SHA512 55309445793c101d54fd61303e770ae271cfe2be20e7bc084ca0f4e6363a8de28ffdd7cd1b8c595c88d5c0a99863182053d00d3a4175fa5465ef958401601d66
 DIST pip-run-10.0.7.tar.gz 32869 BLAKE2B ea5dfea09def536eced9436a114f12cbefccf26c4b37376a560dc1fffdd8167d019ec52d57666d7b4d77dc9c580a5f48455d945aa9ddb4340a7dca88f0ded309 SHA512 cd8780372f579005e40c77b3c2d9e582cd1a144e871eec205fd0bd2ff64eac837918211d3479088f56bd3043dbfd883502b2d6f7b01dc24448888f65fdd6920b
-EBUILD pip-run-10.0.5-r1.ebuild 1415 BLAKE2B 731baade7f77c7dd56e9b151745b22d7d5ad284c5e9828b07ee4f95acaff050d909649c79fe0fe81e81a0967637d62ef13ee2f3e59c2a697153ee4946fe6a050 SHA512 6e6365cd49511237fea207e50a8b78682ef34debf641c5c7cb90162b8ff351891aea61f77720fe8c35b90db7486df985fdf5bf384b636145dc7e6719c674a81f
-EBUILD pip-run-10.0.7.ebuild 1423 BLAKE2B 546e13d3b18bad6895f8b07d00d05845742cd8ff2d6651aec361d5f928b392b3ed9271dfef40f095279916366657ee14b62d7b7ea5396bee55c4f7a0abd061ff SHA512 77654483ae54d60c0d4b8f6c4c0b8b02c52d77ab473c7e8693bcc2e03c58468dcda58cafd8e1684bb3d12017f14edf1ce42e262e416da7d7c91c4c5cf56b0277
+EBUILD pip-run-10.0.5-r1.ebuild 1415 BLAKE2B 37eddbbd484c549b5a3c5274c0f4fe29c093c0c555c43e47a00de0127c4196f49c39e157a588e08c5b1a6ae6f19cbf206e47e67aa70a7718519a01d382ed3105 SHA512 0ba95169ac46a7649f8bce7ee8d5cc81e6cdcfc2c77f014a6692e1f2717351cfaf2bd529bde083ebc59853b452d8749ac36034768ef980ac6e2d1a307a3fd4a5
+EBUILD pip-run-10.0.7.ebuild 1423 BLAKE2B 13ede1445ba38326c3e98dccf3908e8d41bc73cec45b3666e3742ef7a9bd081b8b3faa604ea6a4d6f07682a1c88a8f2038e1ac14eb8e9d3d3af7cb29a42b4d48 SHA512 a65fe0d167923b64cdd6edcd66146507890c511d2ae905ab9053c68ec6f62e3eac32ace0ab6346d0bbf8d54445b30629ddc5f6b75fd6671b3e128715fac3bbc8
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-10.0.5-r1.ebuild b/dev-python/pip-run/pip-run-10.0.5-r1.ebuild
index 5c994d916137..1f7892c02014 100644
--- a/dev-python/pip-run/pip-run-10.0.5-r1.ebuild
+++ b/dev-python/pip-run/pip-run-10.0.5-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
 	' 3.8)
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/pip-run/pip-run-10.0.7.ebuild b/dev-python/pip-run/pip-run-10.0.7.ebuild
index d9897d60ee5f..ade76b38dff2 100644
--- a/dev-python/pip-run/pip-run-10.0.7.ebuild
+++ b/dev-python/pip-run/pip-run-10.0.7.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
+		dev-python/importlib-resources[${PYTHON_USEDEP}]
 	' 3.8)
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 382bef5d71f6..a0373680d271 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,5 @@
+DIST podcastparser-0.6.10.tar.gz 31717 BLAKE2B 19ea422b78c7631fd2622f935e292d5bb14a31ab749db36a9a19e356a5a331246e7d853412bf913522588ce6446be2070f2ad4e6c1b50d245058eae49739519e SHA512 55b822a80f8fed56feb41d5f9a39c04371e4e11dead45b8ca6aaf666ecc26dc3c94673331da59e2ed6665f2a9ca367b6daccb24f987b1763b6b3ad8b302ee783
 DIST podcastparser-0.6.9.tar.gz 30399 BLAKE2B a1882cdb298b3e2dccc0aa821ffb97863377b51b6dd78bcd09e00d9170b88c94298996ca20c7515ab761f9ff0c73b371b7f8c9b3c4fbacbcdc2215004e3cc137 SHA512 5e28b361b5fd0aba22c8c34318d3c8f575d82913f7de0f8f62ced9c8d904dcfcf40282b8b832867998f820de6bd5b793ce6be4657dd04b4965a151e32f2f0131
+EBUILD podcastparser-0.6.10.ebuild 434 BLAKE2B 26b71d82a43d7b5fd5c6dce56f43cd6f4b24bf8a3121d2c556e62cb4b82e95533ec2c6b83477947bc2f86ac769f26de4428bbe9316205f71cbdd627f2c7fb327 SHA512 f1d73442ebbd9277c388346e88427c85ec7a1d2e601b94821b31fc84337c594bd9b520ac07c2f145df7c3d894b227cf5e81c9ffd72f928d2a4d72e647e51e2fa
 EBUILD podcastparser-0.6.9.ebuild 432 BLAKE2B 0426235c4b05881f79037b7d58166cbe512bb71f2d3ed2a30c480af7e02079662f7e9a257dc5e222040ae95968e419cb9b9ceebe150212a3f28e627ce9f34a6a SHA512 3f93f50bf221de257c5be2f0a941b9e97d4a44f966a42c3f1cdcf4ca4141f64d0961c3c6c825814e76c1d79e6438d2bf30a68a9647f01d45e4fbb946ed02b992
 MISC metadata.xml 516 BLAKE2B 2cf902a3f89e91ef879ae5a9ece9dc5a3991ed06c2fe4542a330e5e52f24f850728a8d1588d02481109974c6cb400e6e53952356075c42cc4b0079f383fc4119 SHA512 947c15724f072eddd93600a0c47555c5a191a0c6bb28d1fad0149f6ac510b932678c494faa36a959d4639213c4133b2a9c28037177a6fddecc171b728f561d23
diff --git a/dev-python/podcastparser/podcastparser-0.6.10.ebuild b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
new file mode 100644
index 000000000000..f6fe3dc39931
--- /dev/null
+++ b/dev-python/podcastparser/podcastparser-0.6.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Podcast parser for the gpodder client"
+HOMEPAGE="
+	https://github.com/gpodder/podcastparser/
+	https://pypi.org/project/podcastparser/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index bd14772a22a0..fe3295b9cedb 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,7 @@
 DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928c928b36c512ef05d313ac71e76545eabaca1f6a1ea9dab301c86005ef4c9af9622e0d1c6d7be858b92b0dce9d6031440d SHA512 0d8b35fe76b1caf1265ab4ecf182c92b71714be9612418c945f39c58f384979ed36e47bdf11b11a8cf2fc3925fed60abadf4f3eaea083f6bcd6d2cddb81fb5f9
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
+DIST psutil-5.9.5-tests.patch.xz 3664 BLAKE2B 9dfa9d8d4075c19939057a10be318292cae3feecd000aa594d3352fb92c3531c5bf491ce4b3807102181025975b21a9b88592eae7211e6717519a054a5030ddd SHA512 f29e4c6d8325a145b3f9768b98977b990bcc312c1323e189976163c1263b609af0d9b26b3bd7bf1ffe22468067a343822fde9ef765f7b48701fdf62f1774027b
+DIST psutil-5.9.5.tar.gz 493489 BLAKE2B 3db8ce374d9d81dcddc08f03418675318c5e447f9a3347154d025537ba090811926ced822f83ff5fc9239665b091803a30d167465495049569c3c820f7fbb32d SHA512 2afe1bad5359aeac90378faaa609bab855dfcaa58519c939fdadb02e6e2c8157c77f961ac0f90d104626cef3429e1ea2f686e4dc4c9dccf975e3e73e9b08872c
 EBUILD psutil-5.9.4.ebuild 1210 BLAKE2B 8fc5f64b77ab7f704ac33f64bfd67d2fd411a07b526ede09e120f81e855edb7b7e868d84ff72d58a504ee48a16e5c5721c4b4b4a22846037d03db79229ba0096 SHA512 0486ef275acf2b495546f735ffb44858464915f340964b9189e8a57088db8a2eca9558a5d109569331c6195cebdbf8fd6875d2914befc5cde65fac4c395dce06
+EBUILD psutil-5.9.5.ebuild 1215 BLAKE2B 3e8cacb89172831a6a6be99a5a81d963752cdff78e532192e813f14bfbefd8ed793bb823324aa77f66949ba2ee3db78c8cd3bbb028801c03f678c13ce23d7207 SHA512 1468b65a822139ef68334a8d124d5a7778e2021c64a7dee9505f2750826fcb76123f156a7983b771615a2e36275868cbb71117e1efcf91590edbcec5bb6bf1c8
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.5.ebuild b/dev-python/psutil/psutil-5.9.5.ebuild
new file mode 100644
index 000000000000..a12878b0bdfa
--- /dev/null
+++ b/dev-python/psutil/psutil-5.9.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+TEST_PATCH=psutil-5.9.5-tests.patch
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="
+	https://github.com/giampaolo/psutil/
+	https://pypi.org/project/psutil/
+"
+SRC_URI+="
+	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${WORKDIR}/${TEST_PATCH}"
+)
+
+python_test() {
+	# Since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disabled for CI
+	local -x TRAVIS=1
+	local -x APPVEYOR=1
+	local -x GITHUB_ACTIONS=1
+	local -x GENTOO_TESTING=1
+	"${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# Force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 2dee883c3e3c..ce424b2a45d3 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,5 +1,4 @@
 DIST pyacoustid-1.2.2.tar.gz 15869 BLAKE2B 01f327dd640819dd799f48b32e859fe39dccda3fd62714bf324c8219cf7053b36f1399793523634e9d4f3c6405bed5050abb34bdf53c72ff0ee22708fb57225a SHA512 5bcb3f017c3013eb8fc9e335540a1f5e6a52fc2fefa53d5ef246ba16e4ff615dd1d1cf08b5c80b1a38b149e0fa7dc0b15e4890dcc3f5478ef874b4ec22cf0813
 DIST pyacoustid-test.mp3 4507187 BLAKE2B 54494d9f23481f9d1ee77b136ac3e1790e9fb78c782159ad1793dbebf18f694e13f6413a8259bae84c789f73ea8241e590dbd7e30ccb7377b2afa946335da19b SHA512 faa582640e759322d4bd58d85f4aa7d3ef88fd90aa3c67c1390ba6d4c3213278c11fb60c8d6c87a25e82dffcc54986caa4f0e463acfbcd90993166577e5226d8
-EBUILD pyacoustid-1.2.2-r1.ebuild 1150 BLAKE2B 30cf2a920f82234f7b1a8289d66389f376e6bdea6caaba46eb05b0f87fe5bd2a72a5455e0c1cd4ef3d8c9b9baef6f1f257d43ef088578a08e5641155a36236cd SHA512 31d7375ff2789e8c7ac0458f1cd186ca9b07517fdaf5cdace5a383d351dde32aa41336f0d4ad5fac35c53257a5d8f307ee72c8cdc57fb9048809d271e971f74e
-EBUILD pyacoustid-1.2.2.ebuild 724 BLAKE2B a13a1d39173b49d6c4da9e67317c1679b214de2fae15f4e53c9262ba5dcbbd80434f3e44371b53902f8c33c4a2daa63b4edaa359873e93521338f49928860bc0 SHA512 87cf32244c3f9892dfbcaf5bd5bb0ec4b11c7d20f575ccf3791c80692952219c30eaa4968a7075bc0e58523d810de6e1486ba88687ddab45300be375f4e6c10c
+EBUILD pyacoustid-1.2.2-r1.ebuild 1149 BLAKE2B 09f5948ae64233305d947149c70b8f1304d0e89a3be60b67ae86e51bb8d74c12b3971f299b1f7ce99e8532502d3700e322f741cd5ccc92d2bdea8b4af4d60e5d SHA512 0d0f9334ad2a4544d868888c3fe0ff2797eb2bb45474692719775d56f8c3fa31c4e052698cb01203a69b444c20cce41b5a678f08f454c384e3a289107ca91292
 MISC metadata.xml 714 BLAKE2B bc0db30cff6644da34b7944bec3d60b47f394ac854d547fcbbf3ee4d2719edc4cb781a42b3ab266fb7dfb5762679daaa0e382fd0fa8c2cffdd35af4cc55633be SHA512 6b6063bfe7d64d8a053c0e5c1609d8011e8aeeb265a895db88154e246761027ec2ba5fd582fb08b64e5ee09b3a238030415613df9267620936a718b76d6d1692
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
index b77542b9ba82..9717fc34dac7 100644
--- a/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI+="
 
 LICENSE="MIT test? ( CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples test"
 
 # Tests fail with network-sandbox, since they need to connect to acoustid.org
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
deleted file mode 100644
index 61b5d16abefb..000000000000
--- a/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
-HOMEPAGE="https://pypi.org/project/pyacoustid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/audioread[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/chromaprint
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use examples ; then
-		docinto examples
-		dodoc aidmatch.py fpcalc.py
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 766a745fd9a7..68ee8006bcae 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,3 +1,5 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
+DIST pyasn1_modules-0.3.0.tar.gz 307901 BLAKE2B bfcfd1442b3e9cd542d4f47160b54308ff5ab0373394f55007a1a3963342b8217bd89b5b71dba9e4a69071e805610c3060a28df40249c9b8a1898f941d40e35a SHA512 fedcf95e0452e133fc0735a1be29fb5e7df563243203463c66b85d9af6194a550c78a96fec2d915be1aa6b98428f51b6ed4feb7ed3838c515d044fbafeb2cb46
 EBUILD pyasn1-modules-0.2.8-r2.ebuild 710 BLAKE2B f34ef1392d3590c62c16a6cef73c0317cfb989f5834cdf960ba520dcffaa3ef7a1f8aaaabbb0e2fbfdc5c85b3402f7d4a2695182657a9f51ada761390b767b8b SHA512 c7aaa157aa60e9fcd28a99eb1a475c05e9c79498185800c9a68b09580186d980e1848f322a569391d0b8b85e628b2d8d7e53078aef24745e4b9e3bdd67d3d9f9
+EBUILD pyasn1-modules-0.3.0.ebuild 742 BLAKE2B 79395fa48e1dc288fe582b0788e4fe958add00519b9d51abee39cd068badc64969c9c82d03b8cf188f6d0d1d588d84fb40de86df210c4006585b8d1fb6a05639 SHA512 9c64f4ccfbe8d567071f176ed9200655a633600e898dd8a96ab7e9fe08a2c1f8b34874c8a1062138d6c2cc63015f0816ee923bfc03e9d0e2493bf1a11a95b5ac
 MISC metadata.xml 404 BLAKE2B b5d3c68b942e6c2ff5a1cf31cc0b43ca1570e1d4280a85f376d7b81abbe540ca889f87039dd26fe1f595a2ca8b47acc4ec03bfc5598ba06a8e651c60c2277c93 SHA512 c4784ac61152a9d609e337f7c186b214b2e3add22d54ea7cfaaa0c8fc4fb9e0895617d0b73692aa7326088dd7b7e1ced8a871ac8312abc1f6b09fb558a4d385b
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
new file mode 100644
index 000000000000..cdca036e890e
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1-modules/
+	https://github.com/etingof/pyasn1-modules/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	<dev-python/pyasn1-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /usr/share/${P}
+	doins -r tools
+}
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index cdd06630f231..49bbb62c8726 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,3 +1,5 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
+DIST pyasn1-0.5.0.tar.gz 145117 BLAKE2B dbbec0bebcfe11b8de983716fedf1bf28e6bcf7d5f89e3dcba929884347cc7cd3a8ef8b5ec44bbc799a7bae3de39c90cf5e48111384de571dc2034a79c3bb52b SHA512 763690184ce891555564d76902042791865815e59e1325100fca692140110e5e182ef3da84ffdf96b1876edeb2757bbb09c06d26e752a8110760dafbf9e3ca00
 EBUILD pyasn1-0.4.8-r2.ebuild 576 BLAKE2B 00dacaef0995fc35ed70642fa1bec28624baada731eff7aaf4e1cd52969f5aca31caf81c8c3a51802989ade2d7ce9c63ff5b9755b32647e1654515efca99b3cf SHA512 4c11a0897c61c2df488b3ffa6f9d9df870cce6df24935d0ff341edb78e0fcabe1baa88874e19ba51afee71528948337dfedde9d6c58a1936c72e2f3b5c1851ac
+EBUILD pyasn1-0.5.0.ebuild 584 BLAKE2B bdbf18b0540a0d0ed7c77c5167af5007ce43d5e018c45185fb26bd42ec0cd58ce603dd106300d59d3309d79b1a448a5a1ae3edf60195051f996f41eda2def8e1 SHA512 465a49b59cb7cd812bfad82290cb05ed93b92cbba2017b1e80860233c6e3bf92880e5b625f3d51209635979c4aa4d366eaafb6394d0c69a5b41adbbf3db85d06
 MISC metadata.xml 401 BLAKE2B 28d1b58f4b16507dd595524f0eb3fafa93a68222bc56f0040b33e7458b2ac471409c798af1014ccc50207fd0ac66a566aba36e1f0c04a22499396620f3477945 SHA512 a25c0976b4d0ff8a6ede6b84b6933b3405f8cdbf74416f01e91508f0c72d2dda4b4ff63c011846052b683bc7a3f7e5e0ea068d3b506d256bb15fd8dffafc94e0
diff --git a/dev-python/pyasn1/pyasn1-0.5.0.ebuild b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
new file mode 100644
index 000000000000..65fba7ed2b93
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="
+	https://pypi.org/project/pyasn1/
+	https://github.com/etingof/pyasn1/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 227613b059b2..0688c5b39fe1 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,7 +1,3 @@
-DIST PyChromecast-13.0.4.tar.gz 51996 BLAKE2B 11dad948443e9e5957de6b22cf6c1d33d19030d53cecddd9be5595dc82bb108e4746c382bae5c6d22d5219bcb90ed5bed7ca94c714ec7bbe7ad1330a1ee3cf2f SHA512 2f9bd925e452448a387a04babc0d71a35fc83edd30142cdd129479b5b20cf7aa9691a8d46f45edf5f12fd6f3052564c2956dd241eaf1a1c468b8399b065286ec
-DIST PyChromecast-13.0.6.tar.gz 52068 BLAKE2B f1ac2885106221f9dc2b4ec78b33a5664458e08b8b63588183ecc6a6365fa5baeedda86cbc803dbcc5ce5b7c9b1f0323309ef6cebb3a0a5c7326dc970967176d SHA512 9ab70b1c47b1bb67b9d6d95395c8cb0bff9920e0ac371133d7121f86ad4f392b97009b502a05c19f4d169f28c09b8f7e391c6b6c0be6fffd8015753eb1df47de
 DIST PyChromecast-13.0.7.tar.gz 52074 BLAKE2B 4e67ce21bf91c52cd83b8a17d86cd321d937c1f55b567d4df7a5548ad02aacb4c269b9d29030a7e41f9f310d53313b6b287032c1d5f1448b415c3896b168b783 SHA512 dc63c901287ae31ce278c9978701ad335715f1daaab1b2683aa7b02ddb38e3e207f2527ae144f6836b65c4ddb4b1fdd62c40005bf776e0655e647ab40634857e
-EBUILD pychromecast-13.0.4.ebuild 620 BLAKE2B aa9be36c5d86a0ed29b9a69cfe7413aad43a2f1d62c4ffa5c000f7392adc95956fb16b743699f1fe307157e6b5250e847b310819584779538515ef350bd221f7 SHA512 5ef0898253e0e3dea9adcadcca287728ac071bf7cbd0c07376561a55593476ae536034c6e7bf545bce12775b1cc6791c90acb2c0c58b9934e0b28634310f0a44
-EBUILD pychromecast-13.0.6.ebuild 622 BLAKE2B 353f741e12f4c1194ac62b12278a811765ecc1785257e4c7188f077e37d56d47876b4c933e79ea87b99f8cec814745e16ef448839f0bb7cfe3a49a1390c18fa7 SHA512 d91b7f755982e078a499dc46db6e6d9eb2e361d0dd7b489b392b8827be6bdd2a81081e4a8006f81fb6b5ca86691471a3c3d6500985a44251064b91d7e402ca01
-EBUILD pychromecast-13.0.7.ebuild 622 BLAKE2B 353f741e12f4c1194ac62b12278a811765ecc1785257e4c7188f077e37d56d47876b4c933e79ea87b99f8cec814745e16ef448839f0bb7cfe3a49a1390c18fa7 SHA512 d91b7f755982e078a499dc46db6e6d9eb2e361d0dd7b489b392b8827be6bdd2a81081e4a8006f81fb6b5ca86691471a3c3d6500985a44251064b91d7e402ca01
+EBUILD pychromecast-13.0.7.ebuild 620 BLAKE2B 98d50975480282bf150dc230b7df07b34a558e96eadae8cd9f507275750cf3468e54a60b48a5af3eaaba21e1813f9db68743a347971742aa0035612c8e68f37c SHA512 3ff83413dd2078421f4d04dfef3c210131217a40d8e64ecbf3780f5fec82d7b080a128b02c95e2156565354be4428c622fa47628d32ae432ac9e333720f93e21
 MISC metadata.xml 426 BLAKE2B c6ba55f1c61ac177a8cc1aaa78831d0d848bdfffc787197f1e24944329280f7c93be5b26ea2d4cd65a07b9ec0f192ac23f6a3a2470b5d707fc9f3063cb8bd869 SHA512 968632d3dc5e9a9dfaec80485b52124efeae5fb315f56a53d5168f3f51f4c4d6d7b4b74281b67fb6a41bafc19decf2afe73d42858a10a7fed4b49b0624cd54ca
diff --git a/dev-python/pychromecast/pychromecast-13.0.4.ebuild b/dev-python/pychromecast/pychromecast-13.0.4.ebuild
deleted file mode 100644
index bd0d54534c96..000000000000
--- a/dev-python/pychromecast/pychromecast-13.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=PyChromecast
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to talk to Google Chromecast"
-HOMEPAGE="
-	https://github.com/home-assistant-libs/pychromecast/
-	https://pypi.org/project/PyChromecast/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pychromecast/pychromecast-13.0.6.ebuild b/dev-python/pychromecast/pychromecast-13.0.6.ebuild
deleted file mode 100644
index 1c1b32308cfc..000000000000
--- a/dev-python/pychromecast/pychromecast-13.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=PyChromecast
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to talk to Google Chromecast"
-HOMEPAGE="
-	https://github.com/home-assistant-libs/pychromecast/
-	https://pypi.org/project/PyChromecast/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pychromecast/pychromecast-13.0.7.ebuild b/dev-python/pychromecast/pychromecast-13.0.7.ebuild
index 1c1b32308cfc..3a63ef820c58 100644
--- a/dev-python/pychromecast/pychromecast-13.0.7.ebuild
+++ b/dev-python/pychromecast/pychromecast-13.0.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/casttube-0.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 2f8766f70468..a15328ec2b81 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,7 @@
 DIST Pygments-2.14.0.tar.gz 4434562 BLAKE2B a3050bae96a8ae044f803e7964b5dede7a73b04f04f6af9d4b9e4d24e3ae0185138d0d68801ee5ac81cdaf74e50c7fea303913470c23182adb30ff2c08c332a8 SHA512 51416a8e2a8d0288cbbf6fd81e6870ffe9d999da255c43d0f870eb5cb4d01660416d136d39fad38b76c4bace3c3aa648fb306519e85e340545a87fc657aaeb15
 DIST Pygments-2.15.0.tar.gz 4818485 BLAKE2B c7890910d3c62803f48e52192ffec636343302bdb54f82fd0863bdd1b1fd9f437a4e714f39e955f8666f3ed50ee9b576373aabfde9231c9b3bb6d41453a6252c SHA512 5b9ca24ded1a16ea68d77d727ead635b3555c4c3dece735fb6c122aaef49b9f50bb8ef462cd60aac43eff88ed32415ec8e432e0ac5677bc02c14670f2aef97e4
+DIST Pygments-2.15.1.tar.gz 4819591 BLAKE2B f42d3342b88c5b5745fbfbd1f76913f7d17745d396311a39627aca8e968445b19983e7c633583097c495ce6f43a6a7224262a7c35645751803b6c1172062d8c0 SHA512 408f0bbbc8226ee91b82ed084d178f114657150bcf9381dd34debb704399ccdb2e78cb5578ff297797771660d7263c51c305d03b2a27ae29269110be0bca50a9
 EBUILD pygments-2.14.0.ebuild 872 BLAKE2B 38111be304f7207fe115abc4d7ad32148b0e0326bafa1cc23807b58e4bf82ecdeff50cedb955949c6d288347c021017a00209c28428252db5f696de98b18bcd8 SHA512 a0f7ca9b64852dc3b82c7a3b70223282263b8108d44a46e725621993b82af23c7b96542e7b183bde4398bd204c862a17218a15ba2d5fc623cbde4a4f6fd6a15a
 EBUILD pygments-2.15.0.ebuild 974 BLAKE2B 71398269554790960cdda4644aa289e699ed8de713b10ab1fe36a3256500a442c6de6b7543204f4dc47b81f5aa8a5aef8befb5ae44ba9fcb19dd3fe559f8cc45 SHA512 54cfa9f3a25d9fb70aea21d2719eac33c95bf0a19886d136a9a86f00193682dab7f9219c08204ab34693803edf9be7cef53b8cff67c3e7dd5426b3949d059395
+EBUILD pygments-2.15.1.ebuild 974 BLAKE2B 71398269554790960cdda4644aa289e699ed8de713b10ab1fe36a3256500a442c6de6b7543204f4dc47b81f5aa8a5aef8befb5ae44ba9fcb19dd3fe559f8cc45 SHA512 54cfa9f3a25d9fb70aea21d2719eac33c95bf0a19886d136a9a86f00193682dab7f9219c08204ab34693803edf9be7cef53b8cff67c3e7dd5426b3949d059395
 MISC metadata.xml 618 BLAKE2B fbe7a30ff157e4e13592f96ef8a8b9be60ef2f8e72c08baa56dcca027dde82715b78b3b670ef29190d88dbb582f5cc5fdf9aa2547db5d714c666c28020b54def SHA512 860f398e047e516a8ea4d7fd4e900f1c8efed92422c304e305dc16df9e536ce7be7e06407f93caca0d47f6f929eaa66b2e56acd25105d4f232b841eaca381eb6
diff --git a/dev-python/pygments/pygments-2.15.1.ebuild b/dev-python/pygments/pygments-2.15.1.ebuild
new file mode 100644
index 000000000000..18d730b2435f
--- /dev/null
+++ b/dev-python/pygments/pygments-2.15.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 bash-completion-r1 pypi
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
+		virtual/ttf-fonts
+	)
+"
+
+EPYTEST_DESELECT=(
+	# fuzzing tests, very slow
+	tests/test_basic_api.py::test_random_input
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index de6d753a1e8c..b2426ad1bc74 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,3 +1,5 @@
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
+DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
 EBUILD pyside6-tools-6.4.3.ebuild 1380 BLAKE2B c80b111d63f3f6c4de373534328c85f8f36d9b754aef72c3e272d9f89c0b62d7cc16784744c9225a2b828fc2df419c0f0d9bf84b915ab3f30bb1cdd05e719aa5 SHA512 e98c7feebd5c0133d5e2e4ec99452df1c1df08c697842c4c86482f601ce94d07408fe8a211ad7973cc13d77c96374b65987846fd29444d670207be56a03874bf
+EBUILD pyside6-tools-6.5.0.ebuild 1380 BLAKE2B c80b111d63f3f6c4de373534328c85f8f36d9b754aef72c3e272d9f89c0b62d7cc16784744c9225a2b828fc2df419c0f0d9bf84b915ab3f30bb1cdd05e719aa5 SHA512 e98c7feebd5c0133d5e2e4ec99452df1c1df08c697842c4c86482f601ce94d07408fe8a211ad7973cc13d77c96374b65987846fd29444d670207be56a03874bf
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.5.0.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.5.0.ebuild
new file mode 100644
index 000000000000..3bbb97c28eae
--- /dev/null
+++ b/dev-python/pyside6-tools/pyside6-tools-6.5.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-2)/sources/pyside-tools"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/pyside6-${PV}[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			# the tools conflict with tools from Qt
+			-DNO_QT_TOOLS=yes
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/"*.py
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	einstalldocs
+}
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index 133aaaae4f3f..003bd864667f 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,5 +1,7 @@
 AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
+DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
 EBUILD pyside6-6.4.3.ebuild 9155 BLAKE2B 1c9ed40606a9d0e8e6785715ac1398caa5727581778f37df490489ab0197c1870671bb23075ff0d19a8dc8d9eafc3822bda12d0c33e4ebbdb12458262a6ebaf6 SHA512 dda651a801e0e33d0e22459a4bb3e46f95360638a74ad4457edfbac27c98bc4ae59819fa4183335a19f3ac3dcb087dfadc26291c26b67822af81fb3daacaa91d
+EBUILD pyside6-6.5.0.ebuild 9149 BLAKE2B e1bf3836b19fcb9d7d3bf541b8e16a0825e6b6aa907679654d06adec4221d968f8fbc056dcf7c3018f3b4fb8f149e6a3a941ec1e23046ca9eaaf84a181cda42c SHA512 d6f34369514a860a28626c0b54f58e813a0153ba7266410c3124075a56f3df7a785d80bcf4758f83a8c4c63aaf820e7f3ebd66a0f5a748368cf99672a1f407b2
 MISC metadata.xml 1830 BLAKE2B fe8b0657824ef49182b8a5ac334539e10ff88d56f1d0ff517ce9247f0ec1c8b82158688fefde8e01c99fadcb0268e6e0109fef49830ffdec821e803e2ad23517 SHA512 4b49ec54b699673da2c9173f849f70e2a42321608c2893fa9d161a2ff51a917864042b3c0421c3723b98bcbde0d53e78e8c832f25a689dc7e3499d05446a014b
diff --git a/dev-python/pyside6/pyside6-6.5.0.ebuild b/dev-python/pyside6/pyside6-6.5.0.ebuild
new file mode 100644
index 000000000000..a8b6ba2391a0
--- /dev/null
+++ b/dev-python/pyside6/pyside6-6.5.0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1 virtualx
+
+# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects"
+# USE flag after an external "dev-qt/qtremoteobjects" package has been created.
+# TODO: Add conditional support for apidoc generation via a new "doc" USE flag.
+# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once
+# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support.
+# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note
+# that the "PySide6/QtGui/CMakeLists.txt" and
+# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by
+# testing whether the "Qt5::Gui" list property defined by
+# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation
+# time contains the substring "opengles2". Since cmake does not permit
+# properties to be overridden from the command line, these files must instead
+# be conditionally patched to avoid these tests. An issue should be filed with
+# upstream requesting a CLI-settable variable to control this.
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-2)/sources/pyside6"
+
+# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details.
+# Shall we allow essential modules to be disabled? They are:
+# (core), gui, widgets, printsupport, sql, network, testlib, concurrent,
+# x11extras (for X)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="
+	+dbus charts +concurrent designer gles2-only +gui help multimedia
+	+network network-auth +opengl positioning +printsupport qml quick
+	quick3d serialport +sql svg test +testlib webchannel webengine
+	websockets +widgets +xml
+"
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	charts? ( gui widgets )
+	designer? ( widgets )
+	gles2-only? ( gui )
+	gui? ( dbus opengl )
+	help? ( network sql widgets )
+	multimedia? ( gui network )
+	network-auth? ( network )
+	opengl? ( gui )
+	printsupport? ( widgets )
+	qml? ( network )
+	quick? ( gui network opengl qml )
+	quick3d? ( gui network opengl qml quick )
+	sql? ( widgets )
+	svg? ( gui )
+	testlib? ( widgets )
+	webchannel? ( qml )
+	webengine? ( network gui printsupport quick webchannel )
+	websockets? ( network )
+	widgets? ( gui )
+"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2)*:6"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+	charts? ( =dev-qt/qtcharts-${QT_PV} )
+	designer? ( =dev-qt/qttools-${QT_PV}[designer] )
+	gui? (
+		=dev-qt/qtbase-${QT_PV}[gui,jpeg]
+		x11-libs/libxkbcommon
+	)
+	help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV} )
+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+	quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
+	serialport? ( =dev-qt/qtserialport-${QT_PV} )
+	svg? ( =dev-qt/qtsvg-${QT_PV} )
+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
+	"${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch"
+)
+
+src_configure() {
+	# See collect_module_if_found macros in PySideHelpers.cmake
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets))
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets)
+		#-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml)
+		# try to avoid pre-stripping
+		-DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes
+		-DQFP_NO_STRIP=yes
+
+	)
+
+	pyside6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
+			-DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}"
+		)
+		cmake_src_configure
+	}
+	python_foreach_impl pyside6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE
+	python_foreach_impl virtx cmake_src_test
+}
+
+src_install() {
+	pyside6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig
+		# file for the current Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+
+		# Uniquify the PySide6 pkgconfig file for the current Python target,
+		# preserving an unversioned "pyside6.pc" file arbitrarily associated
+		# with the last Python target. (See the previously linked issue.)
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl pyside6_install
+
+	# CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., pyside6-tools) to target one
+	# "libpyside6-*.so" library linked to one Python interpreter. See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die
+}
diff --git a/dev-python/pytest-custom-exit-code/Manifest b/dev-python/pytest-custom-exit-code/Manifest
new file mode 100644
index 000000000000..55d4c17fc836
--- /dev/null
+++ b/dev-python/pytest-custom-exit-code/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-custom-exit-code-0.3.0.gh.tar.gz 11147 BLAKE2B 1ffbd021f9b637de19bccc7f6fe41048b6fc600236a29faa2e9729c814ce42c8d08ec19f29de4852ec3f82f6ec850740f5bb2c7119e047c2498edbed2c8bb6dd SHA512 6b412866d60580908d6e53829ca7c5661a7a7ff4927f014e8765315da6152c1e459b5076874a11c54f7b90e7a0480011d80d883d51f437a1780ad8442366e3a5
+EBUILD pytest-custom-exit-code-0.3.0.ebuild 773 BLAKE2B f59bf8a268837281157163fabaf8eca0a6ba5d83b2ebba9f7a24c71e671c6cea210e36a141df39746bebd8cc99da8bb5f977eb80ed655bae7dbcdffa33da7520 SHA512 ab91611f60bdd3b7bf7305e35a14798ec8e1528266dd41681399522e57a4ed063a1cbe0d35e9a461e3cc7faf65faae5e4705977c03bd12a85840844370758e90
+MISC metadata.xml 410 BLAKE2B 14ad3097a9be8542b398b87faf38a55ba8a601d0f86257bf3505cc855a3aa6e22d401a1df4603649ef6bd77dc381499175cca5a58864a6d6aa396538420470e1 SHA512 3d81563cfaed1ef43d27540922dbbab9d4b1cd606eb8754534a25e6c80c23af2ee5aff5d495518d92fce86a299ed3523ddb2ef8e2b62ac76709adaa5d91e0056
diff --git a/dev-python/pytest-custom-exit-code/metadata.xml b/dev-python/pytest-custom-exit-code/metadata.xml
new file mode 100644
index 000000000000..7205210a2a24
--- /dev/null
+++ b/dev-python/pytest-custom-exit-code/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-custom-exit-code</remote-id>
+		<remote-id type="github">yashtodi94/pytest-custom_exit_code</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-custom-exit-code/pytest-custom-exit-code-0.3.0.ebuild b/dev-python/pytest-custom-exit-code/pytest-custom-exit-code-0.3.0.ebuild
new file mode 100644
index 000000000000..9e5a9c834bf5
--- /dev/null
+++ b/dev-python/pytest-custom-exit-code/pytest-custom-exit-code-0.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+inherit distutils-r1
+
+MY_PN=${PN//-/_}
+MY_PN=${MY_PN/_/-}
+
+DESCRIPTION="Exit pytest test session with custom exit code in different scenarios"
+HOMEPAGE="
+	https://pypi.org/project/pytest-custom-exit-code/
+	https://github.com/yashtodi94/pytest-custom_exit_code
+"
+
+SRC_URI="https://github.com/yashtodi94/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pytest-7.0.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests
+}
diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index dfc704b2af5c..8d42464c4a2b 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,6 @@
 AUX pytest-salt-factories-1.0.0_rc20-tests.patch 17428 BLAKE2B e52c44dc43f08f7933fbcea60e4ba39351cdaae79dc4037a490ae222cd41286feb308c66abe90116417f72ac0aa3c968dc30afd914545f3c08ce5f4c75d43a85 SHA512 6ac3af11d518834125fd41e9e3b49a383079cdd48888044b3009eea4f0a066fe2b8b8d20a8fc7cf6331cd8269c98140d5203dcf0f5a64504c952d8a5bd652ef2
 DIST pytest-salt-factories-1.0.0_rc20.gh.tar.gz 160140 BLAKE2B 7ecd9af695626c465e5776ed218bd92f30a556394cf4af0c2b6fb87c182f8aaf2d8f998358a7eef95fae53c85a6be2d4ed5a6ff191496fcac62a97e25cf19063 SHA512 5677c6638b5dc7f90c01f2c2204e1910c2bf6ea2c10b714173d3443d4c682b5f515ad7881e2ceee66f6eaf619e399d6fa10052604fdc9c5157c58348b63c8f2b
+DIST pytest-salt-factories-1.0.0_rc23.gh.tar.gz 162711 BLAKE2B 28610679d7717d7a6f97a2f14a1ac838aec5101171ae65f2328d9b902d04b272c5e37f08d8ff3414af52ff7af954da24c083dfdc4afd1a9342b09cce0bf5aec3 SHA512 22d8f4a1c48a144437b9ff7d064760b59bb2a1003838e07f446a6150a77c162bffa7f21c570f796d8214d870d5b029e92abf7b0410ce19726085b607628364f0
 EBUILD pytest-salt-factories-1.0.0_rc20-r1.ebuild 2098 BLAKE2B f8100dc074e78206ce1da4f5a964de6f18be4c7fe1ad181c1101db5666d68532d4a65882bc62dd03e7e0e72ac6227337ce9e1467d3d348abbe8b4f684a5fca36 SHA512 be97b9ff2e501e8e9cc252482446aa00fbf253a9ee6e12c691fb9e14685c39eac710c96242d0f7c18f1ce4e068d7b61a3cc8e7f466a95512aad4c0b55fe43c8d
+EBUILD pytest-salt-factories-1.0.0_rc23.ebuild 2160 BLAKE2B a968778b2f0ec594c1adc2189f72c02331e417c5554b1804aeabd4f696fc3190dd684fde3143417093345909ccce045257a0cc921bade872cfffe40d7d9ce2e3 SHA512 d0d211c6edd8553538883fcc770ddb4b03ca717d9a6851240721c6685935b321478c3a7c7f89728c522e6cee3ae7777e209efacfdd9fbce68250defca324d61b
 MISC metadata.xml 429 BLAKE2B 84a4af391d2a8bee687c8499a7642117ee99483439c044695d5d68a546fad02f1e6e96d88a56c2eaaac0bfcb8f7df97313723fe562885c72c952f052334fe825 SHA512 f561d42e196c7d9bcfe656149ba40e94a52c84f3fe518b6039dc9c7c1d213c22bba8817bc35563049526efb59cfc6eeb1ca9c1021f635a099e81e72fbb5d3c52
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
new file mode 100644
index 000000000000..23dfb52c250c
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${PV//_/}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/docker-py[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	>=dev-python/pytest-shell-utilities-1.4.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-1.0.0_rc20-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local tempdir
+
+	local -a disable_tests=(
+		testexcludetest
+		test_version_info
+	)
+	local textexpr
+	testexpr=$(printf 'not %s and ' "${disable_tests[@]}")
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" || die
+	addwrite "${tempdir}"
+
+	(
+		cleanup() { rm -rf "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		export SHELL="/bin/bash" TMPDIR="${tempdir}"
+		epytest -vv -k "${testexpr%and }"
+	)
+}
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 2126ee03a92e..1b21c253b312 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,7 +1,9 @@
 DIST email_validator-2.0.0.post1.tar.gz 45136 BLAKE2B d800462f55ee0693917a5348107bd68af2a9c0b6e1a3ccbf28aa22716bbf6da2998bbf4b16352e719c13761b895a85566911bfd4422a516d77214a729da41aca SHA512 0e72d88dea00ade9a8727a4d3ff9a239f581afc14bf7c7a22a582d69e70c7653371c035451493b89fc1a49c70aab8cdfe6159285ea5e8976e645199319004029
+DIST email_validator-2.0.0.post2.tar.gz 45253 BLAKE2B b213ebab2a10acf6c2ab95d382fa78ef92f41ff85ce25c1cfa5a65403e728fd05c66df3dccbaec77eea469d0665701ad5d8047c31e69b57ed8e6fe52f3a1f9c5 SHA512 8c4abc955d909ef05ca89d6c6931bce06de199c33c5f8d0744d44ff00ee69c1841f295882af3da03963cc90ef031da46cdaef90249f73e0c7b47f19dfb816b62
 DIST python-email-validator-1.3.1.gh.tar.gz 28691 BLAKE2B eb69028066e969a935117f51a32d75595468797a82608bcb7f6ebcbebada01aac29e3e223efc849dc519d85897a375cdc584760f3cb5a431e2c39aa566c20514 SHA512 7806ef35c07cf0cfef3d8c6c7fe6dd3cb58da091a134b57d879a2cfcdf6425f8729ab8b03194135749ae47b369da47434c1d130432cfaa8eeaf5d07149c15dc2
 DIST python-email-validator-2.0.0.gh.tar.gz 39007 BLAKE2B 319fa94979fdb6b701c1c8f754f2915e02a53de7ee6f06a5409980b1e4dedca75d08cd24e4f5ee35e7803c7ff4dbb03c1e75645dd7e0443ccaa2b26b6035648a SHA512 6448c55dea3d43d1d457f4b3f24360aaaa6e4ea8f81db891e94d2ff685ae1d8bc1023d4a6329fc495ff6069fc1a6861185e66eada9d2ed6546e6c6b8716df802
 EBUILD python-email-validator-1.3.1.ebuild 1393 BLAKE2B 6d324c6f5d1e8168fce94318f9442ba56be3145be51e13a225a4552f548c3b2aab0074799cd56907fafa33c1b0da5086c81f17c07d5b596422c30b600061fc65 SHA512 9fcfb4934e63a335a83da858a01395d0daadebf103b507a93afb28121a2b25b33f9468c50ebaeb8a79e40aefaa29c366baca48b25e505181ce612f5ddbd69660
 EBUILD python-email-validator-2.0.0.ebuild 828 BLAKE2B efe0b549e13517620e3847193b530df0bf80b2e8833ee5fa26825814420fb25f33160b551a17add594526a5447cb9fa58f07f9370e1c1be73e943fdfc9a6b14e SHA512 15e5968f2161094cf942cd74ac8940c53aa5b08c1922dcf04b37dd3571975f5634f1364131029e5474a9ff7f9f5586e5b9c301df43840c4e59af12b60e14084e
 EBUILD python-email-validator-2.0.0_p1.ebuild 751 BLAKE2B 6aa61d4427e06bf092290229fc2e312887ae2768277b31df970dac273ae6eb0d398193701adf5f081708969e60ce7a75d52d74b0a8b5481d85458752f9ceb1ff SHA512 61b5cf8802aa26b9bd67ebab128c8a7a524524f07486b9fa4aca63bcc9de22c75444d81b582c8f849736690786327fd00513328b76b498f5f20ca00a53896ccb
+EBUILD python-email-validator-2.0.0_p2.ebuild 732 BLAKE2B c90a5170a2cdf999773cd290573b3eef8194e7b3f92abadb5b74c9a7fcd81f72688957de5c6b7dc9eb0dd05894a489bee490f44ae8367c76c9cff98016325bc7 SHA512 cc80bb82876cac3713e6c7790f056eb9a7ddf6e6695e7eb5e95a4ac882aa5b38e9bfa35b3ebf8c5e2ed0f1fa350ac14e0704ece9b57d886bf55a0bbb52e7a8fc
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
new file mode 100644
index 000000000000..2778e3b55030
--- /dev/null
+++ b/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=email-validator
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A robust email syntax and deliverability validation library"
+HOMEPAGE="
+	https://github.com/JoshData/python-email-validator/
+	https://pypi.org/project/email-validator/
+"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -m "not network"
+}
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 5215a4698a46..fa2a4b266397 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,3 +1,5 @@
 DIST python-engineio-4.4.0.gh.tar.gz 309353 BLAKE2B 4cf40802fddcce2e53e205bdbe73bdf0ec822e15581fe4a9939b8d05c3eb6ba82a99d089d4708169b197aa79e5b5f14001ff86f72025fc6d96c99ed6d73fe620 SHA512 b7995aaf2583ec58ac87f048608653ade3846dd103616ee90b3dc12cc7e27c7d37959cd3e1ebf6e138395ff6fad8cd011407b6660258715e513bf72c8a3e1f6f
+DIST python-engineio-4.4.1.gh.tar.gz 309475 BLAKE2B 4ae5dd9887f4d3a70d4983d2a0f0de29b1a54d30961bfc430b8850ff4af73fa1cd9abad6caeb8248a44def42b02e26ecb0632dd9b4d57e2a7f44b33762659304 SHA512 a903ae4f5a4679f6d46fda09901b637ef8dcf2896ece8781460d27aab7c8da606e16a89ac5dea94c156d8196a7e931626b2310b41ddc61d4241b5e004ad2ca64
 EBUILD python-engineio-4.4.0.ebuild 1340 BLAKE2B 59c5e2dd26758fa40545965b509e7e0d72543f8413d2ea10cb6ec32383e686fff0314c61f7ba2d67819b8b57fd9ffb90413df024a20736222988acae3f9b3ff1 SHA512 228d7ed354b92b770fffa5c6fbc21c91de61839643bd83c4279a84cd70950f67108c6a9fce4e2e2bdbadd9d17f9d17613ce36cada9e671fada933fb720983783
+EBUILD python-engineio-4.4.1.ebuild 1340 BLAKE2B 59c5e2dd26758fa40545965b509e7e0d72543f8413d2ea10cb6ec32383e686fff0314c61f7ba2d67819b8b57fd9ffb90413df024a20736222988acae3f9b3ff1 SHA512 228d7ed354b92b770fffa5c6fbc21c91de61839643bd83c4279a84cd70950f67108c6a9fce4e2e2bdbadd9d17f9d17613ce36cada9e671fada933fb720983783
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.4.1.ebuild b/dev-python/python-engineio/python-engineio-4.4.1.ebuild
new file mode 100644
index 000000000000..a47389eb7079
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server"
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+# Can use eventlet, werkzeug, or gevent, but no tests for werkzeug
+BDEPEND="
+	test? (
+		dev-python/tornado[${PYTHON_USEDEP}]
+		dev-python/websockets[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+EPYTEST_IGNORE=(
+	# eventlet is masked for removal
+	tests/common/test_async_eventlet.py
+)
+
+EPYTEST_DESELECT=(
+	# also eventlet
+	tests/common/test_server.py::TestServer::test_async_mode_eventlet
+	tests/common/test_server.py::TestServer::test_connect
+	tests/common/test_server.py::TestServer::test_service_task_started
+	tests/common/test_server.py::TestServer::test_upgrades
+)
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
index fc64edb82b4f..f48708e14ec9 100644
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1,3 +1,5 @@
 DIST python-vlc-3.0.18121.tar.gz 152638 BLAKE2B 4b6fb51809bb1ee79cb4e1a5ccbd3db330c5d443b14171b75b6c762b59a62816a87a6b8d6fe5c47641c2b72d875fece41adc257c41ee9bf484b3a5df36dfa939 SHA512 3b5d44142c073dc5a98b6c62bbd4f675434aef9a5eb24f0c80ab19bc29a63877b6c4ab5cf56233c5f2fa0a5b40cc9c48583a8868fea5c351a8d751e32f51d807
+DIST python-vlc-3.0.18122.tar.gz 152762 BLAKE2B 311d3e450160db5fa7ec2cbf078382a8cb1c4a73a42aba7aa47dcfdeb09f1be26ace94d8dd2cd49d4c300dd8a74fcb1bea93a9b7f913e31d5240f3eab0249601 SHA512 f9233cba21ad986486d088c70c721d79847858762a10519bb19f69e2dbe4de9899304080742cc6bac3a53f7489152c38a432cff3fed516ece7e2b5d3136fc0a6
 EBUILD python-vlc-3.0.18121.ebuild 451 BLAKE2B 8e37f4f88d81693341290093120a65c87416c20ab79120c8771cd5b17725e4a1fff662bdbe4b72777f19891253f8e7d15279e6783e8b4c2ffc50de627ac4cd24 SHA512 204cbb5f9e52bbd0a515fa3bbc954747de852f9c1b9a595f57452e1ccbc3dcea1a6272e748b4af5d5048070df7689531605e6e7808aa32b3f0bf0e3e53e09c8b
+EBUILD python-vlc-3.0.18122.ebuild 451 BLAKE2B 8e37f4f88d81693341290093120a65c87416c20ab79120c8771cd5b17725e4a1fff662bdbe4b72777f19891253f8e7d15279e6783e8b4c2ffc50de627ac4cd24 SHA512 204cbb5f9e52bbd0a515fa3bbc954747de852f9c1b9a595f57452e1ccbc3dcea1a6272e748b4af5d5048070df7689531605e6e7808aa32b3f0bf0e3e53e09c8b
 MISC metadata.xml 357 BLAKE2B 0c56f8cfe0e66e7c73e7c353426c1f12ea56884391034d5f0664decbbffa57f176b2d516ddc8a2ca890f729bed1c74de393049c3cddff188f1d5d7c2bb1dd78c SHA512 57e362121d3249fa2a8bc6a4b5cfd4da89c31e12a72ad1adc03e25e7d4a7ccaa2341396f91975ff822d517b09c1878f719b9293f284488510185c8658408093d
diff --git a/dev-python/python-vlc/python-vlc-3.0.18122.ebuild b/dev-python/python-vlc/python-vlc-3.0.18122.ebuild
new file mode 100644
index 000000000000..b2f7d18b3207
--- /dev/null
+++ b/dev-python/python-vlc/python-vlc-3.0.18122.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python ctypes-based bindings for libvlc"
+HOMEPAGE="https://github.com/oaubert/python-vlc
+	https://wiki.videolan.org/Python_bindings/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/vlc
+"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fc7a292ef8c6..d27977dc1577 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,4 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd6aa67a14f0cf42ece78463788d74b97bd951b75c48c185c5c33d5bea29c44c8660649bf79035012bc75b915e9d0a42 SHA512 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc
-EBUILD setuptools-67.6.1.ebuild 4433 BLAKE2B 1575f862feccb180c567e02e542896159c9665f8dc3888d4a1ed9240cc0fd6c3c2670b66f5ad9140f0ec7068f76edddfe47fedb2298b9603fca898b4c352f98c SHA512 d0584da2b12a8fa7e35a8673e324027ec4821f0f3e6881adf0a9f4996d6cc9338797696aa21e2b899f2a8af8d2038ea20a65d3ec23101bedf3c960c9d25f2c2b
+EBUILD setuptools-67.6.1.ebuild 4433 BLAKE2B ee7aad8ec1b5ff9d90c6a9e13f608d99b027b7a9e58b7dccc60459304637952c751b4bb6cbece6ccd9970540379bceccd3b8928fdb30065aafe193a4d4438122 SHA512 57327f340317249f788a008c73da4a1016886ed93cef877cf98d1eaa743cc4c42e05adb633fefb1d5d5691864ff27fa1b9a40885a1084fca21e523e0be6f69e7
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-67.6.1.ebuild b/dev-python/setuptools/setuptools-67.6.1.ebuild
index 9638410a9e9c..164d1f7d0206 100644
--- a/dev-python/setuptools/setuptools-67.6.1.ebuild
+++ b/dev-python/setuptools/setuptools-67.6.1.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
 	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
 	' 3.9)
 "
 BDEPEND="
diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest
index 6d508925a4fc..ba9f15fb088b 100644
--- a/dev-python/shiboken6/Manifest
+++ b/dev-python/shiboken6/Manifest
@@ -1,4 +1,6 @@
 AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2
 DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa
+DIST pyside-setup-everywhere-src-6.5.0.tar.xz 13566572 BLAKE2B 2eb038b08755ced2dee34a309bbb18d47b40ef0b19bbf42901695bfdd4fccf35e09bb939ae9d7049e6477436c11dc1424376d8f1cbbd8fdaa2cd978114eedb9e SHA512 4a1f88d18d7276182c83b6deff8d57c4c40914292b61dcea76975de5506d7fffa4db7b783161373585ff90dc96a2acc6fed98d06a6a35fff6e92864f2699ea7f
 EBUILD shiboken6-6.4.3.ebuild 6477 BLAKE2B 81128aafb302660ca2e259bec6148555887648be9ffb5b6cd055c9b39b7d93a77759ad59e805757b3e6256200e4ad245ee78ec0b39a08f4ec1e33fc93a22b242 SHA512 a11755eb4b633825d108fb3ca7998ea2b53542fa14b6a174c45036753060f39d92a3ef5c5fb8f0316efc1c3f295bef6fd46b456ee6d4e2b2f26d5c5eadb519f6
+EBUILD shiboken6-6.5.0.ebuild 6471 BLAKE2B 192393129d4e781456c611cdd9b31bfb9e9a8ed347e2f2a06c8fd449efe798e4a55c04cee911b65cc5c8383426b1b109c0401bead811336dea6f4d1847557121 SHA512 7994ef754f449fafd22db3f0d5576752e2c95d6ae79fb743b648bd8b8ca6821c05c390246b6468afd7d8834b1193667ac9f738f8519f669ef3329256953e00a5
 MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98
diff --git a/dev-python/shiboken6/shiboken6-6.5.0.ebuild b/dev-python/shiboken6/shiboken6-6.5.0.ebuild
new file mode 100644
index 000000000000..6db14e7d7cbc
--- /dev/null
+++ b/dev-python/shiboken6/shiboken6-6.5.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: Split the "/usr/bin/shiboken6" binding generator from the
+# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former
+# requires everything (including Clang) at runtime; the latter only requires
+# Qt and Python at runtime. Note that "pip" separates these two as well. See:
+# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding
+# Once split, the PySide6 ebuild should be revised to require
+# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime.
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake llvm python-r1 toolchain-funcs
+
+MY_PN="pyside-setup-everywhere-src"
+
+DESCRIPTION="Python binding generator for C++ libraries"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-$(ver_cut 1-2)/sources/shiboken6"
+
+# The "sources/shiboken6/libshiboken" directory is triple-licensed under the
+# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3
+# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be
+# arbitrarily relicensed. (TODO)
+LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+docstrings numpy test vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests fail pretty bad and I'm not fixing them right now
+RESTRICT="test"
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-2)*:6"
+
+# Since Clang is required at both build- and runtime, BDEPEND is omitted here.
+LLVM_MAX_SLOT=15
+RDEPEND="${PYTHON_DEPS}
+	=dev-qt/qtbase-${QT_PV}
+	<sys-devel/clang-16:=
+	<sys-devel/clang-runtime-16:=
+	docstrings? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vulkan? ( dev-util/vulkan-headers )
+"
+DEPEND="${RDEPEND}
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+"
+# testlib is toggled by the gui flag on qtbase
+
+DOCS=( AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.3.1-no-strip.patch"
+)
+
+# Ensure the path returned by get_llvm_prefix() contains clang as well.
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	# TODO: File upstream issue requesting a sane way to disable NumPy support.
+	if ! use numpy; then
+		sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \
+			libshiboken/CMakeLists.txt || die
+	fi
+
+	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	if use vulkan; then
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			ApiExtractor/clangparser/compilersupport.cpp || die
+	fi
+
+	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide6 does *NOT* care whether the end user has done so or not, as
+	# PySide6 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+		ApiExtractor/clangparser/compilersupport.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Minimal tests for now, 2 failing with the extended version
+	# FIXME Subscripted generics cannot be used with class and instance checks
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-DDISABLE_DOCSTRINGS=$(usex !docstrings)
+	)
+
+	shiboken6_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DUSE_PYTHON_VERSION="${EPYTHON#python}"
+		)
+		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
+		local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+		cmake_src_configure
+	}
+	python_foreach_impl shiboken6_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	shiboken6_install() {
+		cmake_src_install
+		python_optimize
+
+		# Uniquify the "shiboken6" executable for the current Python target,
+		# preserving an unversioned "shiboken6" file arbitrarily associated
+		# with the last Python target.
+		cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die
+
+		# Uniquify the Shiboken6 pkgconfig file for the current Python target,
+		# preserving an unversioned "shiboken6.pc" file arbitrarily associated
+		# with the last Python target. See also:
+		#     https://github.com/leycec/raiagent/issues/73
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+	}
+	python_foreach_impl shiboken6_install
+
+	# CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing
+	# downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so"
+	# library and one "shiboken6" executable linked to one Python interpreter.
+	# See also:
+	#     https://bugreports.qt.io/browse/PYSIDE-1053
+	#     https://github.com/leycec/raiagent/issues/74
+	sed -i \
+		-e 's~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		-e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \
+		"${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die
+
+	# Remove the broken "shiboken_tool.py" script. By inspection, this script
+	# reduces to a noop. Moreover, this script raises the following exception:
+	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py'
+	rm "${ED}"/usr/bin/shiboken_tool.py || die
+}
diff --git a/dev-python/signedjson/Manifest b/dev-python/signedjson/Manifest
index e00710b27b0b..dfc94e38e333 100644
--- a/dev-python/signedjson/Manifest
+++ b/dev-python/signedjson/Manifest
@@ -1,3 +1,3 @@
 DIST signedjson-1.1.4.gh.tar.gz 12714 BLAKE2B 854f28074b82490bbeb6a0a0b3528d608b2ff6f5ff3cb52c913525b81f483afa6b4c8423dc25d9adaa3c3a9f269ec54409af0e7f8b5ddf3903e33a9b00c0dac8 SHA512 8928b9ecf1d6a9291a07bc3270ef57a824267ad45c114cfb720fc4db36415301f6bee26db9bb447e0051d3366c5471f718f37238bdd841bd06e73f5841f13ed6
-EBUILD signedjson-1.1.4.ebuild 843 BLAKE2B 44fae568be252dca52c8401c3e4a3eb2389d91e2d6c9b0006325a96b5974b00e6a03d9a30ad605e6b9ba309689a82e082b8477ab7e4cfa6f4a5a2f30097725e3 SHA512 a49ac9edc38354bd2b5f25ff8315b71148637167b03238fbb6308271e1fd218846f02adb32dd4772658d207d478c57d6ce52542065a973a8e2f21421921650de
+EBUILD signedjson-1.1.4.ebuild 848 BLAKE2B 9c967b42a2cca316684e4593121179e47f6ae3fa07abbddfba48f7ed8ea1a6ae05e20efbcbe7e020919d6bfebbce6524b1af50ed493423f9ec3ff4737e0c93a1 SHA512 0a779c714e4e30eed5024f8be0a9634aaeb5e3a948525a7adee916003d70e6dfcb8e20de1ee656a6f159ee74921734751c150e7c31f0a8d4c8909556656c27c0
 MISC metadata.xml 556 BLAKE2B 51945382315a5b47a5d9a673852961d15ef873ca7f6fc9d63ae435248a3a682bc434608178063ac44ba9b295d23ea41b7aa290f1603ac3820c883641ad547422 SHA512 bc802cec550589c8bf6a9ef6cc2f72df1f261939a44c94304a024ab4a4c71479bec4210dc72289c38a41624cbe219f804e0189d5bd241dff1a6f34b4e18eadca
diff --git a/dev-python/signedjson/signedjson-1.1.4.ebuild b/dev-python/signedjson/signedjson-1.1.4.ebuild
index 8c361d0b228f..10a241fb217b 100644
--- a/dev-python/signedjson/signedjson-1.1.4.ebuild
+++ b/dev-python/signedjson/signedjson-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/pynacl[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' python3_9)
 "
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 16ba584c295b..e0827e9124a3 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,7 +3,7 @@ AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c562
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
 DIST sphinx-5.3.0.gh.tar.gz 6873479 BLAKE2B c57ede5e3d83447c6152d050d45df73bced62ce0cdcd84ea6316a48bff072590ad036c469dee053a9dc5eb1a7ae53b350aa25b5fe14c3378dc6543186552f720 SHA512 6877635d46f2e1f2b4cf4edaca463d85bf740a13bbeb867486efd57904aacc42626e6a4f58ad971e50808d31391d068702c4f2910a95e5c86dbd68d87e2552c8
 DIST sphinx-6.1.3.gh.tar.gz 6720056 BLAKE2B 8d8753a7735df1d2e86dfc1c6347ea6fd550c5a6abd5e4cb2b884e0ec9d9de5179eac241cad98aad3ee09cca26d13f74aecc2eb2f61067eb20beb4a26159ac4d SHA512 b1cdd1ae8e643306cbbf26bd926f0fbd6c76a11098cf35c8088dd12f4c8ac4dbb5a7acc0676608d8268059191756e71741564a72e9786a66eb2282afd0271f27
-EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B d790339f1d9e54aeb1033512c3564eebfdadec4d43c0d8c8dbebcbe8e8e6247adcf45f1544462f1d7f2931778afd86e303c72c498cb7b42263720de440a9289b SHA512 9a99a7e072091c826bfa743cd4e4b36301992d62b1430f7b4a11e34bfeb0080fb77889d9825623a18a1aa85c38e32428a28854909a3219ed557faced58c4669e
-EBUILD sphinx-5.3.0.ebuild 4159 BLAKE2B 4567d63076d180f82f549580d52a7e42c60d84a47938c45f28daeec30b65013fca997fec04dcf58a1112ce9807ff5389c01d4a6041d1ea81b921ad31d81727e5 SHA512 b88ca8f1c9f6509eebf9b64ff909b26ca6af341a0c7de63bdf0daff40d300af3091d9b5529f34823d96474935891045b6f362daec673332e6f6630ea0aaf30a5
-EBUILD sphinx-6.1.3.ebuild 4248 BLAKE2B e9284a4179bc29580b963c6d9dda5fa9e5af7e2e1795735a173ec4e35f09d17aa72150c064a11cd559df0a2773c2fe3ccf109a963770ca1ff22b873239647c94 SHA512 12ba085b85b21064c82af5a773cfcb67c668ed4c1566699b0bda90e24431e8f1c7d0ff0f3132bf1d825b03eff9515e77d981c4ab890781980c1a96148e87dbf3
+EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 412695ce12bfd153cd94fc8041464abccec5efdcea79331650ec8aa5a7637bf51cfa45a2390699e0fadf925e29098d4ff12f686edda2543addec7c89daf81696 SHA512 a3bfff311b043c23e21785e29aec10ecec9898478c0fcf6350a4e10a3db5455b037f5ae173c4a5007cbe92869e7f444971d38b1485dbb3cf10d5804d75743b1e
+EBUILD sphinx-5.3.0.ebuild 4159 BLAKE2B ed77635323232e55afa4a4defcdfaa9b6cbfc4e12f2f36fc3a4e503e740946e22d0e5955306bbf4c78b9be39bab25753f134a246b1ddaadf3f249cc7dca13d2b SHA512 d471fbbf2cdc89ee3df738f74c9d6b2e9d940439aa6a6f74d6ab1fe97edac8d5b8bc256a6c42b194df7dc9197200c969062c3922c0f6de7e70538786c2f69f02
+EBUILD sphinx-6.1.3.ebuild 4248 BLAKE2B 839ade1564f76388f19c66df1f636a80de91039caac5b0100ae594a385a5f5da69d46f199266ae138fdbeea57b1a11b58744545ab258080f69aff1815db0f015 SHA512 5679f036f926b49db0fb4eb6afbc6e5fc1d67092e9a1014b4f5d3da805d2bd73f21f280fee0d0243cda6e3be3b56850431c07e182bb2e7feec7e076c524491b7
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index d26e19bcd8a4..97e87fe600ad 100644
--- a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.4[${PYTHON_USEDEP}]
 	' python3_{8,9} pypy3)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx/sphinx-5.3.0.ebuild b/dev-python/sphinx/sphinx-5.3.0.ebuild
index 8a395c538c8f..59f6b07a942b 100644
--- a/dev-python/sphinx/sphinx-5.3.0.ebuild
+++ b/dev-python/sphinx/sphinx-5.3.0.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx/sphinx-6.1.3.ebuild b/dev-python/sphinx/sphinx-6.1.3.ebuild
index 47c0067bed8d..03ffa67fb3ad 100644
--- a/dev-python/sphinx/sphinx-6.1.3.ebuild
+++ b/dev-python/sphinx/sphinx-6.1.3.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.8[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-4.8[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 2bc92fb29d33..2ef2ca0d2f1c 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,4 +1,3 @@
 DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-EBUILD sphinx_celery-2.0.0-r1.ebuild 473 BLAKE2B 5301a9b8b575d512ef782be55fe3ac5db72f1179c3f751e8c8faa3e6bad0ed22c4881b7b74a87e5e80e6d65dbb6bd209fbfa8a190b9866be032030733db6e0d7 SHA512 35d14ed70d3b5ff05b43060e93d24763db8ec77bee13efe90c23831559f7b10e20c227ad336f9e24dc3ae2f3d95ffe319436ee4484f96a6b6f208f2c53c9d51d
-EBUILD sphinx_celery-2.0.0-r2.ebuild 463 BLAKE2B b430f837a2d3ce8d15c2bd24aab0476e46aff85e3207317770d5e26665980a28f8d42f0ec1c3ef488f51c121befdc182b5ccd800d2805ff008b394296c28837b SHA512 736c351941b9898dd4334092dc4ff1e12811dc6c86cabffca34f936d3e0089d101bad7a1dd88431eec14af8979360acf46d7b2ce3cdc1af804101524461215ed
+EBUILD sphinx_celery-2.0.0-r2.ebuild 461 BLAKE2B 28cc6f2d8757fb689d768a6b06c066599ffe736e0f22b0cdb478b45a1feb3d3718830759c7ed3042ef20177214d9e1390afcd66695f2f1cf17aa242ec83180e4 SHA512 cd33208a5d9bbf37f180546522d0dff146a4afb9cdc431168567402dcda67aa90cf2b5b8f4a4df0c28d9bba79e308a89bc5d21d3344ba4e6a1cfb2b1916c1fc9
 MISC metadata.xml 355 BLAKE2B 12bfcfd706cacbfbd3c28692b0e50f45b8d62306682e1207123d2bdcb490197b3f0e3e142d0d57778a0eb9caa868f0d88e1b7b30b17e22cdeaa7a8265bef4eb8 SHA512 b6a7a301eb8f6984a60e707fd8ca5c5a88cb286e24b6dc98baea473670bad8d3e898384b140bc22711ea80a514e6bd0d256ce6e7a814a175c36f6755713a0e44
diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
deleted file mode 100644
index 5a70f7ebd8c4..000000000000
--- a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND=">=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild
index 9d49030dea68..8d5b79ee5db2 100644
--- a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index ba54df784813..a61d79a4160d 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-bibtex-2.5.0.tar.gz 113310 BLAKE2B 5bd39fccf33897bbbf8359a09f07a6e7146d4fb3c1ccb63ad96d3980cc4a256e0b9b37bbf6ceadf65eb01937741934e1f30841587eb6246b50774c81e8428998 SHA512 c99b4bf8cbc73e94e7e4486b4cb58de0dc928079b320ee7d7a473ee27b7f1e349a4765a30059aadc3fb0c6161940c6f2eaf7afdf5ac1c64ba73ed80fba5b5e45
-EBUILD sphinxcontrib-bibtex-2.5.0.ebuild 1096 BLAKE2B bfc6364d85a69ca505c7adff948547233e9ec27389657f3f61bdb6bd154855e5ecef18c37d707b2b08874caf0d3d10ef4780e86a588b921c0e2e93773fa05ad9 SHA512 9cc0a71f42c9c45da2887e5e6692bcca56c9e963e7f4c9ad1d86e118c819d6a1d14e42ed81d2786df8dd26739c6878db19fcee156c047ce0b64ab00973bba0d8
+EBUILD sphinxcontrib-bibtex-2.5.0.ebuild 1096 BLAKE2B 1596b59e32bc0d6b5dc279e9d01b74425f7d5d4a4a207e62591fbf76be11390aa15ccae929877d3be49c2adb43fe7f43046246890c34475b8cb05d9b31cb39a1 SHA512 0c6341e52ce27b7f53fea5f6d147ef2c4a0be7a0f4a588fbc9d3d059b5b19a17ccdd7e660346def4bef29ef3dc22753eea306e50aafa216399e55a34e4363f9a
 MISC metadata.xml 539 BLAKE2B 9990d81362d6a2d5bb471fa2372b92d3ce4a4d08e57098dbe981b7a2320c46095e404a6077c5d5c57daf752c03bb4cb809461a05f11e1c2ecf771db201f8147c SHA512 421b99f9834ca4240a7959f99a8907379e0730b8c2ce608533ba4cafff3a8502738044675f0abed00f5f1cec195c18f5fd933404afff6f3c9b74c7cca02dba31
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
index 081b40e9be74..8bd3e4861056 100644
--- a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	>=dev-python/pybtex-0.24[${PYTHON_USEDEP}]
 	>=dev-python/pybtex-docutils-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 3819459f017f..9b0dc5c2242a 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,7 +5,7 @@ DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e089
 DIST SQLAlchemy-2.0.9.tar.gz 9318327 BLAKE2B 6fd734aad4a7c281164a6a4188066d5e14996a80c849cc18b979d2acaa4bd24ed66c8ddc37de2c08759e8c0a9b36a0009bdb48123c6a50fc5c8c382a1e5df4ae SHA512 e81193ac254280feee542ad61a28540d62441d0471bdcf00cce20d3730ad956414de23ccce6d3bf8781c0970c3c825407b909d645d58c9657c38ba68716dfe54
 EBUILD sqlalchemy-1.4.47.ebuild 2835 BLAKE2B c2ed746fa742a1a59acec80bf6c7b0342c28226e3235fb3a7ae46a2d8b260cabc05840ce58d091bfaa16b7601b24c4da0f3ef32364d8817258af0551f560d787 SHA512 a326e8a93a6b6567314833c9b1b2f3da08cdab0176166e7faf7e19fb5ba65bbf0a54ab8ab1772fc7394157af02eddfcf40055292ab05431af6210adda30bdb3f
 EBUILD sqlalchemy-2.0.4.ebuild 3765 BLAKE2B 0250e7fada00dfd9043367270cc40a7e4ffaafe587859fe7dd938dc4f7714f6a016779c928856ac35f64a430ae6f6c5629f2458dc85beb0388820fba69f81dce SHA512 565ff18cae76c9383848b569d78a4c61a5ccf1b760c363eaaa80ef489daee95f210a589a710fa273ae35ef99e768fbd17d72f2a221d31546cd43e298f41fe602
-EBUILD sqlalchemy-2.0.7.ebuild 4078 BLAKE2B 1e54b3166a413b94693b4dc597ab203200889b326d3dba64a3b0919480967390d1dc9c7a496507aaa1730a6b64b7a948e5042bd32bdb71e3b59c67498bf05bee SHA512 f8b2b31f9993be4888246aeb5b726734cb0f33011cefbd5e6eb2e2b0950b4193b762d9d8098327c445ac4d4e5e20ad3b6d10712a3c872fbac492466737ff57fd
+EBUILD sqlalchemy-2.0.7.ebuild 4077 BLAKE2B 463a7310c961804ef0f7e8dcb66608c4eaa5ac0f249733c037f59098deea22fea7e6e8f53c86c98f5b703a330c09c4994bbcfabecce8342d2d36bf36acb2b390 SHA512 f20898aadcf1796b39bab2a5d66d43eb6827ab5eccc529301496803b86b444441a6ef3f21b980f79a9bee79a22b30b050aedbfa91eb870ed1afb5a94f8f996dc
 EBUILD sqlalchemy-2.0.8.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
 EBUILD sqlalchemy-2.0.9.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
index 0bf16f0b5df2..fa6d44b516ea 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index 670a1ceee5be..5d78d15a58e3 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,3 +1,3 @@
-DIST sqlparse-0.4.3.tar.gz 70771 BLAKE2B 23c80d2ef9ef094cfcc9742213d7db07cf927cd415f93db29e71bfd1c9033f2a392d69691606c8c32b9a4148630d2c5621a9e3feaab2fe27d61fb8f243783997 SHA512 4061653705a7a44af4e89d370f0b21f276271f9fa75a30b8b1df278abe742e579c7f15008e65d2e1f29e0e815fd946cb9f3c35f1aa391e5698705b8c7bc0945f
-EBUILD sqlparse-0.4.3.ebuild 489 BLAKE2B 4fb6d492c8083613a5d86cf3b458e83a4d63a66812cd762822bc7ddb8cbe34ebd24b2dbe587f10e98702fc65f5768c1f9b3943887f2b0f3a05e8473971349545 SHA512 4cdee910d24991be4fc6d850fda55f0ea877437b6bd4e1534b96584a2bf67e53fb39083f4a2b0ca326d92996da1549510bc5f54c6147642e53d828b17d9aaea4
+DIST sqlparse-0.4.4.tar.gz 72383 BLAKE2B 722db31c3344ec1ed2f1be3406142bf3a1cfb890f459f99778d8a7d8ee213311706f6729f68ccee7beefaddc55583135171397d05e37d41e56568fd39ca23830 SHA512 bb655f8de2466c2ed51aca901b6561b8ac7730bf65f1254d218d7b9dabbece609cadd8a52a092b301895ad83813ddf02691e2de49cf55a26e676a2661c240a2b
+EBUILD sqlparse-0.4.4.ebuild 556 BLAKE2B d47b9a4c991c9f0463a83cd56069082eb9c6ce636ec11955e8e26c841102b81d3f04a28d658fb806328c9c436e2e4a1ea58c1be0e0a565b9d3b8603ba01e6d94 SHA512 86a78173e28396dddf9a521c3068292544373a6fc8832b1981175efc46e2bfefe51ba70f463e3ce023e8b58edd624b333a4af8b9e559569149a64147f1a17893
 MISC metadata.xml 410 BLAKE2B 97f37f1bbd08aa14f30b7057399220b2f94d0e3d28261beb35b8572a8bd54edc7d5cb20a6d66f3e4d37a629b350f452899a12f76c59e71796bfed61e071da18a SHA512 a55605ca5c16014efda6f2c489d8598bf355fb776f1f7972d734b533291dce3f39996a86cd4d6f86296432898e54086cca614e89bc04b200b6fea80ae7a1ccee
diff --git a/dev-python/sqlparse/sqlparse-0.4.3.ebuild b/dev-python/sqlparse/sqlparse-0.4.4.ebuild
similarity index 78%
rename from dev-python/sqlparse/sqlparse-0.4.3.ebuild
rename to dev-python/sqlparse/sqlparse-0.4.4.ebuild
index 9dd66e93c5c0..ee75ea10d7b5 100644
--- a/dev-python/sqlparse/sqlparse-0.4.3.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.4.ebuild
@@ -3,11 +3,16 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{9..11} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
+HOMEPAGE="
+	https://github.com/andialbrecht/sqlparse/
+	https://pypi.org/project/sqlparse/
+"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index 16c4c83693eb..dd42bf994acd 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1,4 +1,6 @@
 DIST tornado-6.2.tar.gz 504849 BLAKE2B 18fee464e043e20dcdd5677bc3a72949140a64ce353e09a21242fcade6d8b668517553c649d65e892d9c3fabacea96903d4e42b70676a62759900abc8f4a202f SHA512 157cbeee21bef29ac68b319329e7fc57db4c68dbb5a245e2171b7a28427ebbfe16b745e3bdbdec5912caae5eaa60c3cbbf8830c9c76fec5ffdf025e234468517
-EBUILD tornado-6.2-r1.ebuild 1732 BLAKE2B 6cc827bcca54ea28439204abd684aba547cdf9e636cd6a4f3bcab1dc7a79727749dc73bcebe6368daa08e1c2c1564de843e721b6f2525acb5dec3f4be276c6bf SHA512 2d9a39488614959247082169228476121c025c5c1cf369e2dfebd0cdb1deab4bb89c43884f98229d1f10f1662851e4ab3c3e6e726c623f235630f743cbe32ce5
+DIST tornado-6.3.tar.gz 507992 BLAKE2B a894fbb62e4246be82b09856977758e8e55886b77917a4a23a6411a58b2b85ae1ae9113e70cc00bf0b0775566d0bda237ab3ba91ff18012c7c72f24dff587a9e SHA512 f25bbf1e489bb53ba5ed502a9241b3629a66a8bee3ba54d8bd96946e478ea06dfdf70e6f937da25c8240cb16cc5c9ff3011415503c7d03e2b1eeb2f7567d8209
+EBUILD tornado-6.2-r1.ebuild 1731 BLAKE2B 4750f57886291ae09f300e20eddee0cccba0dfa07144e563a7ab9aa15879700760e511c1c9556fe4e82d6bf48036aefcfe67099dcb1261a248c538ab528f5ddc SHA512 f32d7d2078531728822b732bafcc8c738656e2a3dbba1ad9e1e6fb09346c4506d2a1814d56e95cf37780a8c8180e0b3560c791a9cb3afc1b45668b780b988401
 EBUILD tornado-6.2.ebuild 1682 BLAKE2B e7e538a617c514b7c76166c35a4f9f2b441ad92b36dbc6a106bea0fa4c5b9782709c0449bed34b46c38f962e7df1745a577f893b1800d25f98d66f10f31caa09 SHA512 ec776527aa1d35b8e81c2450209bfa56be94f1cc2fd245abc80c5808656745380b76a056ed115f3f180c5602f3838e7fee31f2846ee7dbde7786f8286db10d0f
+EBUILD tornado-6.3.ebuild 1305 BLAKE2B abbcf9da88e6413cc75d7e6b1efda18ad742fa7c3467e691ba67bb11349c9f14c38eded49074e028f498e14af8560e1f8541290f58953d1f7992d641391fe4e8 SHA512 0e632b21bf10141731907854cb8c46c2037864e892e9c816b2fa38b02331775f0da2df3279727778a3e8c5772e5362477bac64b327f844a0af13c1856c219be0
 MISC metadata.xml 381 BLAKE2B 96d5942b11b6364eeac2248f6e92a9e7a54094ba2b6e9ef966be4143e1fa01fa0c417027d33a71c51bb094b905b9ff79e05107e1a9debb4b1ef932ba11fd8565 SHA512 cd4db13e0c6a9cf8b3c788c53dc5ecd0dce2cf783e7b2d67dba71299d1c6a3d1dd2c2a76c0d69816ab0da4ca23f831613323c55864fd858690c605da5426bf60
diff --git a/dev-python/tornado/tornado-6.2-r1.ebuild b/dev-python/tornado/tornado-6.2-r1.ebuild
index 189ed3c62bf5..5cc972ab024b 100644
--- a/dev-python/tornado/tornado-6.2-r1.ebuild
+++ b/dev-python/tornado/tornado-6.2-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tornado/tornado-6.3.ebuild b/dev-python/tornado/tornado-6.3.ebuild
new file mode 100644
index 000000000000..d2441620c9b1
--- /dev/null
+++ b/dev-python/tornado/tornado-6.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+src_prepare() {
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 6546314dc593..167435360028 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,3 +1,5 @@
 DIST trove-classifiers-2023.3.9.tar.gz 15792 BLAKE2B 1b96dae0f4a141ab5a5e4f3ebe5fbede972b6d09cd289bded3192dfffb26dd68d85bdd46bec20c1b9fb83dc3f8c521e4512a995fe5950c07c9ccf8d53986aca3 SHA512 a94b4c6d7102934677c4debd55274770d4de7db9ad641a253e4718f65dd4b624a4b0c8f6e83cdaf5ea484cecc975baf8dcee0e50824fc373760b8c5cc2e25f89
+DIST trove-classifiers-2023.4.18.tar.gz 15808 BLAKE2B 72b6b7efa53d40859464f5b055bd62d9a5e82032bcf9be22ec2108761ab383d24791ea2707f96c5cc54af271bfa66f8d17cbe665271aa5c87333aa16e4b58b02 SHA512 b56c4c1c44f3c68b9499fe754adce169202b6bd406d00234ad11d8d6ba9ce0ddb13ea883cfe83e342bd580f3021bf304ea30ed9fe6ef214c8ce60fceab0ced99
 EBUILD trove-classifiers-2023.3.9.ebuild 659 BLAKE2B 2f078e507a30d38edb556617ba5e56c89254eaf827242cfa5d86c2e0e29af37db287d9578837ebad033216ddc7ee7ff78f4502944e9153fdd39f58e4f2681c73 SHA512 40f37eebe0bea5b762a9e1dff394d64ebe2911383e882e0cf3629070bb3609d7b1d1943fad2d732dc002612ddd10c874afe05c93b0798502bcee63552c765287
+EBUILD trove-classifiers-2023.4.18.ebuild 667 BLAKE2B f2c99729b07efd8a89612725a9f539782948df06994a0df00a63cc7c7ce3ed5540a6ebb9248eb41594c283d3b6acdd4d4f73ef6648907c8237a0c148d71c40ac SHA512 7668a4de7549eeef1d384c97e432f80f511bd5c64bebcd9aaa2c119226a1e8600fb5d1da4d981e973347f7a277037ff84617f33b6a63c8b3f969fd517a651c6b
 MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.4.18.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.4.18.ebuild
new file mode 100644
index 000000000000..e404744e2dba
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.4.18.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 3dedbd2bb361..20ac5ece5dd9 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,3 @@
 DIST twine-4.0.2.gh.tar.gz 214528 BLAKE2B c088329a86139eb01d325ec623504c0dfee1231ca8bbbf9ed73d46d4ed9dd79aaac6aaad225cacd64942eb7a3ead19bcb5e224ad9735d9760bd8c9c8e5e69043 SHA512 94dec0b08ea8f4cc5900d743b750f02a668c738d402632a80faef24220f87b4b14824966d6d902e9ddaab741e4091d6a370a7660d02ca27fd6fd0d251a473ab5
-EBUILD twine-4.0.2.ebuild 2081 BLAKE2B af9f576423011a2d6fe027f095bcebce2faeb87961f97b132b47c869d036847dd5067c7a094d2e64ddc538a4942bcba69c4d84b4490e14af33886b33b5238797 SHA512 280c52a4e4d3a8ad2eca7ad1a9d99638eaf67e23f50d341f87c253f75822fba380da0b780fe9013ac0ebfc4a7a7b208727337048ea03327a96b605c56c9e57b2
+EBUILD twine-4.0.2.ebuild 2081 BLAKE2B 169f632316721ffd684979120f0d23e145e28aa5aaeb966c0dc154517617d0026e4df715318d499afbcdecb131487adbc4eeae56e030971992dc4a5364fdfdb4 SHA512 8dce471890e98d9beeeb44ce84a1c739d331c25417dabc97c6a8b6c4ea70a71c0cca1374eeb77027f64a66a7399d9dc742a397e9cb4d790ce7a7446d262251a5
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-4.0.2.ebuild b/dev-python/twine/twine-4.0.2.ebuild
index c78faa3cc4ab..992ac6af8345 100644
--- a/dev-python/twine/twine-4.0.2.ebuild
+++ b/dev-python/twine/twine-4.0.2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
 	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
 	>=dev-python/readme_renderer-35.0[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index b75e3fb2a74c..1cd18bd4fd29 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,3 +1,3 @@
 DIST typeguard-3.0.2.tar.gz 58171 BLAKE2B d11b9592c191f131a48c8545a1ffbc4dcf4fc32f12dd0ba0bbab84c11ae1d6ba4cf6126fdc5d5b9b2ba81f07a3047f8328c7a8c29c1779238a04b12d4fe8b01c SHA512 a8f87494d4962cfa451ab266fb2958867acb677ec07acad0e8ccead16b9f3d59facffbe133de4e7808147caefb2b41c184b19bc82a812d041e90c3c1c1c0667a
-EBUILD typeguard-3.0.2.ebuild 1034 BLAKE2B 447d88f2d887be5bded54bbb8c02536c49e9b19ee577dc80ba7e11d030680ca2981b7c30958efe11fe57ec0f12c326a6084145ab46dc678e377f9ba9cff12e45 SHA512 1c02cd073d8d9dc5d6b6d35afdf77be79cacf366109edb617ccc31fff083627e633d725ef85396afa3126081736aab47fae61eb618535fc62949c1f4b014f452
+EBUILD typeguard-3.0.2.ebuild 1034 BLAKE2B 89e50e7ecd8f970a5b355799a92d672c2ca2f2c25491cfdd8300fc0bc158c17f95d309f9ea9cb1d6be570a73bcc82aa3559a0180b0eaa53a3ae0e9833507bfea SHA512 f5ecbb217b95f2f5b82ef15dc80ca2a1a2a8a9634f28569941cf37f4f841e62a45a0ecb20b69c87ce46544283351d71e7402f01fe0f33ed252c0879fd32d199f
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-3.0.2.ebuild b/dev-python/typeguard/typeguard-3.0.2.ebuild
index 3f32cac8a6c1..5502867a6a8a 100644
--- a/dev-python/typeguard/typeguard-3.0.2.ebuild
+++ b/dev-python/typeguard/typeguard-3.0.2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
 	' 3.{8..9})
 	$(python_gen_cond_dep '
 		>=dev-python/typing-extensions-4.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
index d9b415c94c94..dcb542247168 100644
--- a/dev-python/versioningit/Manifest
+++ b/dev-python/versioningit/Manifest
@@ -1,3 +1,3 @@
 DIST versioningit-2.2.0.tar.gz 742936 BLAKE2B 05bfebce378947a9196b4bd90495dc8f89fa9b79b99e5a4423ff39df77f0353125ba5f2deec1e685feacb6fbb8ee896fd1f18155b985f803be4d21e885689128 SHA512 9169bd04c29937a5d913dfa4951affe9d01f21f513fb6f704bdd65f44c91dd47c366169fd50aecc938992cb32b6cac835359b1dc9a6b431b8b5371125564791e
-EBUILD versioningit-2.2.0.ebuild 1022 BLAKE2B 76f8f4352e0dbfb583aa8932785776469bd5a1b93d555d39dd54c6a07a8299d7ba3f8c32b4643217b7b1c4dcf56c2813a34058f568fca8e293bd30107fcc4260 SHA512 82a78cf51e5e133cd326a62ae7f4725ab198da67cf0163be56c4b93c3d3ef853230d2f2c01069e82295250a209061d6bb0967ffec7bdb0f73278c5691d33150d
+EBUILD versioningit-2.2.0.ebuild 1022 BLAKE2B 38d576986e48b0a9fdd8549b8a4d1cfeeb40c3adf3282b48a2dd62aca2e6247782c096a1145fa518898d916f87ed7da4027e2bf277419e9b58b52d22697df964 SHA512 d3a6a7f6ab0edb66f08fd4eefc8bdd12f4714d96a3ea093add0e98759de71ea7782e4f810cd9b4a83e80d05c3b6a657a1169c9f720b1dff5b5047cc1f04c79a9
 MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/versioningit-2.2.0.ebuild b/dev-python/versioningit/versioningit-2.2.0.ebuild
index 03c79ae142bb..f277575c6d8b 100644
--- a/dev-python/versioningit/versioningit-2.2.0.ebuild
+++ b/dev-python/versioningit/versioningit-2.2.0.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	$(python_gen_cond_dep '
 		<dev-python/tomli-3[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 268187956b51..2338ce64b57f 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -7,5 +7,5 @@ AUX wxpython-4.2.0-no-webkit.patch 1285 BLAKE2B 19fdee2293da214b8ae318b2670298b3
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
 EBUILD wxpython-4.0.7-r4.ebuild 2370 BLAKE2B e8b76a2c2a0b2153c4663a4e514d0ee6c54bd5946e92dc436f854775e410031393b8f8506ae50567490b5b709eb5ada1ab3cf24c980f0a14f2d57b91e21c780c SHA512 f8e47b0de868d90b9a9fcb33c9fa22a96c8ad7d195b35917239ec840a685fdd9fc42f5a0259c644dec17886395bc433a125539ab7b09107f4f135a1b08042b95
-EBUILD wxpython-4.2.0.ebuild 3838 BLAKE2B 86edaeb9e0b8029b9ff9632b997bba342ae911f502f2745b8c87a1b12b45085776ee0449793b20f3cb12134d51069341e3b4723bb3b53902955216487df3ee09 SHA512 416f15a7fa53e3ee5e6dd11a9fb7eb5a0354c53488d8127c6003bce40129e5d9652ac1c7365cf6b20311b2e3fce8b484c206025d3dddb9fedb82d5ee41ca1931
+EBUILD wxpython-4.2.0.ebuild 3845 BLAKE2B 4b4f862a09ffe20168ad39724317c9df777b4fd3082b14f065f7fd4f8a58811f62a2ad8d60bddd41897df3a76eadae140ac37fb34011419b1d7fb0cdbb40393c SHA512 5c4bf32a5dfce1c0fcd1ba77531e4cd0deac9e918481881c5648f1c85c803ef2e0245aa4a01eb6dfe8d0e7b747e1defd2fda53708dabb60fe6ca694d5fbd73d2
 MISC metadata.xml 491 BLAKE2B ffa0cccf66f484c856fb30249bd0ccc3b0da2f3ee8e3c3a0df1782bc58e4867ff99d9711f1784b44b439f2a8bcf297c1082b49a941823f046c7f2c7977a77629 SHA512 a2f5908a276a8f9c512cb59c8d17873398c91b21977371ab724e669f3b6c032d53510fbcd183a5dc340279fc522289e617b8c313c0d825ca70d0d2a5d74f8cfa
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index 3b580365bb1c..d4929d8a7527 100644
--- a/dev-python/wxpython/wxpython-4.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.wxpython.org/"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 # Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 5bfc5e3b75ed..43d286b3cf30 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,7 +1,9 @@
 DIST xarray-2023.2.0.tar.gz 3070514 BLAKE2B 00b08bb75878eed1aa82ac18ae5bc468d87812c90991f95b238048d53535dd884a943a068aec4114ba83c8e3cf1a37570b86ce5557fb33dc43f088a51916b92d SHA512 46b1e29e98a7c1bbe3275bc2fd39b0e5561319b4b9c6bf468c434880c9013c1dd9560b7281bd1b148ba8557cafe91ddf0ac56e5c038f1e995067ff1774162ab2
 DIST xarray-2023.3.0.tar.gz 3686167 BLAKE2B b9c2e04d0278e383aef17280e74863244d458324c01ac59a453e72196d65cad8fbca9f8f99a33b6db66637f742e04e5615fa8fc6eed307f0511954a856f8f3d2 SHA512 c08269e6fc8cdd3123dd7c39e0b85959bafdc53a5da75187fc615281fb71212bf2e45059f8d18fa05339567a4827e7bb68de3e605416929a6a1defdb4ed393e3
 DIST xarray-2023.4.0.tar.gz 3689883 BLAKE2B 50c5a18eaf28fc3bc38bc322dc393ec3e6a66c2651341019b389ba950c01f3950ee13e0922568f29ac1e3650ca9fdb55aec5574abe8f733959f15151208ac09b SHA512 1bb5052cb48e4ecb2d4e9d88cb0a0d3b25469b762d34059b5f65a88c2cbd125711d9af8a46a16b3eff3783f7d7653118b44503f19512ebc89845449a92efe1d9
+DIST xarray-2023.4.1.tar.gz 3690082 BLAKE2B 33b8c8b6694911e0fb670dc60b784e9473a632bbdc793ac85685c9891933e373e40378c7362d7d3f7d6cf584716f8759ad73701d469534b70323d8e20d27ef3b SHA512 5bffb6b09d1188da27f19b6ec652ffb5a16ebdf036cf53f2d7c5b1805e7beababea6505127a23170d8ae8ad9453f429598b17f468c84b72ad07383ea3951d935
 EBUILD xarray-2023.2.0.ebuild 1178 BLAKE2B bec6155037d99a0832d283af7d5ceff48a51aedebe5baab14f293008ea31903dc9029a82992e1be0399c9102106c6db776009e1f10a30c0a7304bba6cc96eaf6 SHA512 34cba8d8521f7b8506c6b84804365397974f97a71cb8ddfedbdd7f0dc4f11e7b5bfa1e8216a73ec8aa1c7bac7beded74088cd5db283dee76f67380c56b4f65ea
 EBUILD xarray-2023.3.0.ebuild 1224 BLAKE2B fb7b48af1ac04366407e8f1243b82cac478898e0f233879e0b8ddb8ecc7ffc99962019e31b4b491ba408c28efc8498a38f85be42c6c517618764b2f0461cbef4 SHA512 e0cbe0459854610dab551ac248fc79e397356e6048898e1ada87cb886c22d97d66dea71cbc8c9793e64120cd1d08b5c5a63fc893227e017f1412409eaafda806
 EBUILD xarray-2023.4.0.ebuild 1737 BLAKE2B cc338022ae7e4b78a4bfe092810ea71f94e5ebd2d768be293be71e87561273e0ea86bb2f90495540989c604b23ba50ca9de6e6ef1bfb5d4ea34ac534ea45c630 SHA512 82477cffbfbe309882ac31e918de8bc87333a19b84fce86811f17a129e97a37e07907b54e67ec87abc849febb7c8ac844d9fbd4512444318ab4a7a95e9fe0a31
+EBUILD xarray-2023.4.1.ebuild 1823 BLAKE2B 4bf1e3d7abaad1fd66db35eb0e75596deb8587a52eb0503d023f9b3ef7f31bfcc895da241323849b0a97adfbe8a00b1f89b212ad30adc86d2d53c333bad6b8ba SHA512 b57d14a46f5efbe17d1806f69095d1cfe99c5eddd08beac80635b8ee0e2438ae6bda0af4c08baec26766a7755fba828c3c2c2a830ae6f24db745c65a797ef390
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2023.4.1.ebuild b/dev-python/xarray/xarray-2023.4.1.ebuild
new file mode 100644
index 000000000000..03b17a87a8c8
--- /dev/null
+++ b/dev-python/xarray/xarray-2023.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+	# TODO: segv in netcdf4-python
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
+	xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index a4fc47cb378f..89a900e87a02 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,4 +1,6 @@
 AUX yapf-0.32.0-tomli.patch 6596 BLAKE2B 9693c14cc55bf54c763dab158e488ce4a3013426d9cac62822715071fe424252e096d2d1b78bcb62798b586edcc195fe9241227c8b85d1e3570aff5bdb7fdd12 SHA512 b859f1b487dd0331a9e59c411072ceba719cd7b95bea450b6d8ed8f969d0af552adde77d9d8251bd31416d9715b238e628df5a7516da8eca028dd1a99ca72731
 DIST yapf-0.32.0.gh.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
+DIST yapf-0.33.0.gh.tar.gz 186345 BLAKE2B 0ce1b0ca9e3838eecacf36c8f666ad58c0f35fbee1384ae5e02f3294892dd23003c39af954ed9deb3aac70397ed9924b92233e229362da1907a9cd2c692fb7e6 SHA512 82846900a9aec22ad2519ebb29fcd3d6e5a787e71e93f80c0169cf796201ae5e970ad7307f2b528e6454264cf61ca96ac4f99442ce6a52b7cebf78ceb2c9a395
 EBUILD yapf-0.32.0-r1.ebuild 733 BLAKE2B e9239d4aae63607352cd1290d88b9e2193df857dc01fd221bd463bbe33b17e807cf7b646736621cf5de4cac5660097bcda3d3a0af6482f7a19d06707b74c8cde SHA512 bc2f1bc4c6635cf3e28c6546140cbadd931eec5d19727267362b8a1b3d53326e36744053931a1c23193b747ab8a0fee50b714d2297d1e4beee4b325f4d4f5987
+EBUILD yapf-0.33.0.ebuild 690 BLAKE2B d3992a3addd3fdbbeb1efbd08e2c0ccdd0f2a734a4979f10d89ea38f38cba48f69ad96d34dd674df0daf15bfb13d2feac82ff6faf2d8e629129c083b5f9f222e SHA512 931e3a37c86cca746ee77566d96533633fa7e93fba53639b39700e6375d46b31554b4e07bbbe713c8b6153864f032eae57168748cf8dc9e5f6e2bab7e8f52588
 MISC metadata.xml 654 BLAKE2B 9b8696004f7b8613e02a2cdc79c74a79806b1e4278c7a6e8b8b82f953629ad1233f1a5d1b1212306c688edba57ed4933fc23ba251ec12baac5c93c67b51ec47c SHA512 ccea54dccfb6f336699e0078cb3cd238b3aff5e7c05c50d6fdaf60e9b717a064c7e0cf27e17b001d252b0b52f7fa48c48eec5789aecd81c8f2e53a6ebb4054b6
diff --git a/dev-python/yapf/yapf-0.33.0.ebuild b/dev-python/yapf/yapf-0.33.0.ebuild
new file mode 100644
index 000000000000..0f9d3bb0965d
--- /dev/null
+++ b/dev-python/yapf/yapf-0.33.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A formatter for Python files"
+HOMEPAGE="
+	https://github.com/google/yapf/
+	https://pypi.org/project/yapf/
+"
+SRC_URI="
+	https://github.com/google/yapf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 49e6a2d16fab..a1286230cf76 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,7 +1,9 @@
 DIST ytmusicapi-0.25.0.tar.gz 61709 BLAKE2B 7a4f0cf52d8d1a5e3310c5df39435d317916562f7d0277b0518e03193daf7995333853c4baf026ed0331ac1ef294897f034b7c97765764a795f34b7581f1788e SHA512 6c131c7c6d808d5a3c02795d5d28e687d92223fed809701d76318a145c7c82c12266b04f37aacb78750a4249f53e759dc891611dcb2edf61fefb19f133072d24
 DIST ytmusicapi-0.25.2.tar.gz 63496 BLAKE2B a3409c29165871a90aef7951e63bd676db0f37a1a027d43bd56a0caed2cfd708f4a402168566a45841e9c500b0c371031f6b470598dea5ca880b7f9029e62d96 SHA512 cbdf327f51f4b1836c7cb14966b6c88b7d1b3b338779131b75aa9c12e96a9bb1d9f232a0a2e732bd12758a0d90e4f0600848ea99bd11a456aca8be502724db07
 DIST ytmusicapi-1.0.0.tar.gz 67193 BLAKE2B c0d2a7580f734d8b34e90a004e9bad7d1fe55c53a22a8fc71399ffe80c0c56fef7d2c4ef99c7b3c97db5d0e087d5a9e4ce48df78e3b257b09d40ef281a953f5e SHA512 27b492d60dce637f2b9defb868c0fdeb270fb0eb4082adcafb5fc314b6fd505ea7e5a93a4596405cad6957caef96e92367dd9bb736cd98a6ebdeff2fc76cf3f7
+DIST ytmusicapi-1.0.1.tar.gz 67455 BLAKE2B 1bb69e263331b300a7ea5e45bca3b43cc2057c48309a0bef4102b8096089ce8d5da163f6e5a63a0259274e2f05303e9d89cedd2949d60ae63a3c05253e7aa0d7 SHA512 eadd80ed7aae0697e06e22bdc513f60fe9be3ebd589be5ecae58aa52806abbed0150fa222d8a418f93705790f48de2b6be9bc3d82888f04972dea5b492ab9eb3
 EBUILD ytmusicapi-0.25.0.ebuild 503 BLAKE2B 276d9472f84a0fb37daa93c00ae142aa7ed776bc98295bb627db2da26928e0c40c7a45d54bdc7769b3ca8bd4bd1ca80d86f79b46794579c3c8bf55feb6181eef SHA512 3f6c02ed0a5ebc92c48dffe7b54c7edc0a6983327617e5ae0139e0b59d77e1897f55a85d86c17a63ec3af558ae7693262966c064a2483f9fb87a7e84e5c508e2
 EBUILD ytmusicapi-0.25.2.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 EBUILD ytmusicapi-1.0.0.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
+EBUILD ytmusicapi-1.0.1.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
new file mode 100644
index 000000000000..3d685ec4c091
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/
+	https://github.com/sigma67/ytmusicapi/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4713a73e7020..a11fbf70e67c 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 61ce305f30b2..e4fc9b1f5c2b 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,3 @@
 DIST cool.io-1.7.1.gem 112640 BLAKE2B 107d7541180de46c78542eab4b131220c4ae4a10210c7ff870f54eb24178b364fcac1abc4b93f8d0eccea197fb746cede95416aea8f3d5cc458626b1fa9a02f4 SHA512 9ab3e6ddd1689b2825f9bd82714b4ef5ac921dc4b2f84786971c3ec448577613cee73084c99090382878b0da43c9228cb2fd3a8627dc8f62ceeeff274dbdc929
-EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 6ee674ffd5bc7b019ef5fed160ad3e77821f653d35e870ba1f6c32fef0246aa6615df4b34d2bf59478df55e0ce07b7af483b1347023e186461c31fe6920f6048 SHA512 68078fcb033d642033a1be86055bb6c23c5fcba59b4b3ce80c9a428682ff092224fba1d7e703a4cec673f05afa67e12258e5afa2aa048c5da417b908b4995de3
+EBUILD coolio-1.7.1-r1.ebuild 1246 BLAKE2B 351713d2bc41c7540e7e41a1e4ffa77eb5acc0a50008ab8290e699e5b06bb29dcdc2bf079216351e759b6a84cae05b94c0e23819ad0323bf009b807e20a2766a SHA512 7bab35cf46c3e430eebf1c6c3c2583de5e02c5a10f0f10d6942005ac47e4b3bf149c014342774023ff228f4cf1a2b044e6fe7580cb218759bfb2ecf4192a602f
 MISC metadata.xml 326 BLAKE2B 5d9e962ae23bfeee79add4ea81a0e221695d07de536ae6fb5fd8fc8b5b97ec09e0c5cabdd379fba8d48f5248e94aeca05e7c9f6d9954bd9b017ca9e6542101b7 SHA512 392df388283e8251fcfffe3d67462b8a4ea91b1d655f444610a53536df5c8e6f0217de0612405317ad6e1644b5cdb2c6c0e22c22f7b60156e69526c200bad646
diff --git a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
index 717ae48c1ac0..ce243d72a5a8 100644
--- a/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+++ b/dev-ruby/coolio/coolio-1.7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index 3947e4aaa077..cda7f3fcb5ea 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,3 +1,4 @@
 DIST debug_inspector-1.1.0.tar.gz 5837 BLAKE2B 49f2c4b8b872ad2be0e6c41d02f7cb64e3f2928e8f02e06ed99f2f2befffe1da4c25024a2069b8d2f19dc71ab182459f6cf75c5b717662e5cfab16a5b66cf41f SHA512 c66d5bf412d9b6a61f456e943a901dbe9018cf92c171e1a7d9a19807c7894ffdb6acaeaed2c8f688927130a14909d0e0714e5b728ad7ccbff0e5f1c0ad20c600
+EBUILD debug_inspector-1.1.0-r1.ebuild 672 BLAKE2B 902fbfd18d5ea2088e392ed44316d59d0955ead6fd98c30ce34c1eaf39a3babfff50e567f29441f1a3f3bd9ba50faaeb6447b0b4c28754b04f9dec11e533eacc SHA512 bbe3131f6ee75d7cb79e6e1cbba03ac584a414ed459d2bc51605ceacd83b3a90a73d9953b843307f5a5b08c848d4a5928e6b2767fff5cb2788085debd53aeb0e
 EBUILD debug_inspector-1.1.0.ebuild 679 BLAKE2B 1ce541ab6145d850dbc2ae961da0a5ca85b80a8a04078848ade6631c0a37ae1737acaccecb78a691c14a09921ca57c6b0b766414c891773279c13109468dfe80 SHA512 b134aeca1b313d60339b6a930b45e584ce400b9e67b9530b7cbc5a345ace0cc7138569412f96a570aa04628be9011016c408ee5ce516b496367a7529d78cb1f4
 MISC metadata.xml 351 BLAKE2B f257a2ee28e3b834d9bde72e9f4024f9f93a3fe043a95a376ca15199fa7edb38cdedf1856438243a05337d3ff8513a88dcf886896c776b3807d1cf4437ac8668 SHA512 c9d8cacc1c0df621f009d74dcc9bdc34df08becfe8675b9931a12e492c91d758409c7803adb3f33bad81bd1c496b54f3b1c3d10ad2e8509c68b62f08dca85730
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..dacb6b727da3
--- /dev/null
+++ b/dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug_inspector/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="debug_inspector.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
+HOMEPAGE="https://github.com/banister/debug_inspector"
+SRC_URI="https://github.com/banister/debug_inspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/extensiontask/,$ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index d8380406377e..881032347a3f 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,3 +1,3 @@
 DIST itextomml-1.6.1.gem 126976 BLAKE2B f66395ebc75f57b845897c9ec3cdabd93a67fd93561ad6fa2284c449518d4da08b3d4cb20529149b006228f0200ed73d3edca23fdc6cc943e0cdb4d09a14b47c SHA512 c122562e54618a2eda090c061d4b65c3d55cbd5325eb7f9d13249959219eeed75be5e172a1d2b8bdcc30eafc7700150eff3b7b09aaa2e5b9dd143f9e5752cd8e
-EBUILD itextomml-1.6.1.ebuild 609 BLAKE2B b6a078e787f86f56f0d6392f8aba1f2dae81bc15b485159afd70f06aee98a9155ee6616c6314c14d229b082c8adc2be1496bc5bc2ee631ad3146d08c4b268ad2 SHA512 4fc2739d7d6d5c871c402bb6b837e218386c09d679bdd996ebee4e5eed4ae12eacbf9a539d3c623d659f2ff38321aa8abb48ed3320db28d24950b80bae13c511
+EBUILD itextomml-1.6.1.ebuild 609 BLAKE2B f105c0ba9c1881bd1eff65c0429c41f7c352db5d295e1f2e5af95f14da12693257cd6a474e0310e6e182ee900162ec5867d4e40acdf39157af09400002a95303 SHA512 6d21ce027540e0081437e511c7b8137123b00bb756c7902eb7fcb517c8861e08256320742bc40ec8e2dd1788e856cfabbef56089d327931741f4cdcb45b28181
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/itextomml/itextomml-1.6.1.ebuild b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
index 57fb3df7e1f6..b768625c0cf2 100644
--- a/dev-ruby/itextomml/itextomml-1.6.1.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 RUBY_FAKEGEM_EXTRADOC="README"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
diff --git a/dev-ruby/parallel/Manifest b/dev-ruby/parallel/Manifest
index 4d5f30041892..eb645149468b 100644
--- a/dev-ruby/parallel/Manifest
+++ b/dev-ruby/parallel/Manifest
@@ -1,3 +1,5 @@
 DIST parallel-1.22.1.tar.gz 23294 BLAKE2B 11a3f902f8a6813b407035088adaf76fda5f27e0e33e7f210ce28fc66f4edf4f8d92a8b0f9501d24013a527f4205b79c6eda2c31f6fa4a646a18e6da5b20e702 SHA512 f106ac605a5998d0e5a43b7863f8400e49270c06e55b6342a84fed788e1e854a26a5e29ec31da9d96a4d403227d002691e27786c25e8d7542f3877bf097e55ad
+DIST parallel-1.23.0.tar.gz 23359 BLAKE2B f7c505484a8ebade97efb61eb18474625ee994e3a4a16e85b264988212e3de093ae7b8cb03de2a6f97f8205b41264b72c13f32d81ed9ddcd2241d3aab15c7564 SHA512 fd80b928ad4c34c71abb62a2e27da6bdcabb425ed68cfef190c0e9f56c853147b1c96d7e9b5ec0ef2e7909dd2303892cb293c40a170241158286f9422b6bc780
 EBUILD parallel-1.22.1.ebuild 1606 BLAKE2B d4f02aa9771bf8c56e72fcb67b52625fc43eb68d03fe940d0c1dc622d8a62abf5810f6ad3b91001fd69698a6257dbfbed18ffdfd08fdede0c716682e08b0a3d8 SHA512 a5ab5e078fd1f7d250f48f9d26932c3bc88543fbaf13e8cb4f1859e0a39c50ba9d560024f03e11913a73408c3ab4ae9f01e88a7bbd3a311a2aeb8fb8d0c9665c
+EBUILD parallel-1.23.0.ebuild 1593 BLAKE2B d8024accea17c37d8492ea230a9e838e4b9ddc73470d027bf9d875893632e5406e493e2615d15f0628ec0966764f9a6120fd83772ff60a31dbda10c975b07953 SHA512 d331768fcdf470ab4f9adcb9b646ebde521ed101b51ff3bb2e6ac78882c25f88ca38eb0d1437f590352b29065bae10fd6b75c8c6576eedaef9fb5046c31164a7
 MISC metadata.xml 343 BLAKE2B 319ce92e2b405a76468f653192288669596fdf31ecea733f88de907cb5fc184bdbc197bae14c3cec97a5f25c47cd6fe3e201ae60ab19e5dc06a2f8b612e2b719 SHA512 7fbc85907d9d51e90d0bbf2cd1431557afb9dae6b15b6d9b9d283e1957606381fad7fa7a0aa05d01ce0921c3ecc33d304b61c567069ee439e7ad2f25d3c86924
diff --git a/dev-ruby/parallel/parallel-1.23.0.ebuild b/dev-ruby/parallel/parallel-1.23.0.ebuild
new file mode 100644
index 000000000000..2777e7bdab14
--- /dev/null
+++ b/dev-ruby/parallel/parallel-1.23.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="Readme.md"
+
+RUBY_FAKEGEM_GEMSPEC="parallel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run any code in parallel Processes or Threads"
+HOMEPAGE="https://github.com/grosser/parallel"
+SRC_URI="https://github.com/grosser/parallel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~riscv"
+
+DEPEND+="test? ( sys-process/lsof sys-process/procps )"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/ruby-progressbar )
+"
+
+# Rails isn't yet ruby32-ready in Gentoo
+USE_RUBY="ruby30 ruby31" ruby_add_bdepend "
+	test? ( dev-ruby/activerecord[sqlite] )
+"
+
+each_ruby_prepare() {
+	# Make sure the correct ruby is used for testing
+	sed -e 's:ruby :'${RUBY}' :' -i spec/parallel_spec.rb || die
+}
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '1i require "tempfile"' spec/cases/helper.rb || die
+	sed -i -e '3irequire "timeout"' spec/spec_helper.rb || die
+
+	# Avoid fragile ar sqlite tests. They throw ReadOnly errors every now and then.
+	sed -i -e '/works with SQLite in/,/end/ s:^:#:' spec/parallel_spec.rb || die
+}
+
+each_ruby_test() {
+	if ! has_version -b "dev-ruby/activerecord[sqlite]" ; then
+		rm spec/cases/map_with_ar.rb spec/cases/each_with_ar_sqlite.rb || die
+	fi
+
+	# Set RUBYLIB explicitly for the ruby's that get started from the specs.
+	TRAVIS=true RUBYLIB="lib" ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 10a9be25e9b2..af242341cb81 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
 EBUILD ruby-termios-1.1.0-r1.ebuild 585 BLAKE2B 8c5d5145580652d0384c9809ecc9996711108f094738a39821fd2b497c5c1676cf29801b302211525504dc866a67a0eddd5c006d654b46c5cc2ee68af202971e SHA512 9037a2c828afda40b2e7654143553644411523d2bd8aae41fd60f769095f3b96ce60f43cff9fdd0f063884e227b1618c519f761599cb0669805633a10fc48443
+EBUILD ruby-termios-1.1.0-r2.ebuild 578 BLAKE2B 55b0d044573f11c06d81623db044050366289139e18c761ea4b8d53f63722015645ba1f10f3de572c6e0d80e18c0b4ede80bb9bb00525dc40f9e512296376762 SHA512 38757e9f2cbd177dc175b9b86d9a34a611e77aec8fdc41d30b4d3f07cda9f55aa632d97b4237a8868e3ffdbcc0da375b90194555dc78671a654bcfdda8daf2b1
 MISC metadata.xml 345 BLAKE2B 7548870113aba058a32107f58f042d6a1616855032a5e32a95b684c5142375037c6d5ed79fd7f3788cd0ebbe8db48b47a6578b7707d34d158faca579449bddc8 SHA512 a71981c265c8ef7f6845370efd733510a1f0a120794d6cf4b9af226287a5b72843602dd0c5e7925ede219a503669e76f300e4a199acb57a909f2662480f15787
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..1bd05430dafa
--- /dev/null
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
+
+# There are no tests in the gem, and the upstream tests only work
+# with a normal TTY, bug 340575.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby interface to termios"
+HOMEPAGE="http://arika.org/ruby/termios"
+LICENSE="Ruby-BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE=""
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index b4944b77aa94..2a35f98dbc77 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,3 +1,3 @@
 DIST sanitize-6.0.1.tar.gz 1352433 BLAKE2B 91614d3a5fe4f3d3741a8cc8d88a98281a43424132e82932600f4140ab857a0a3492d49ed92205a7e9a05f9eb0b350c30b3b0342790baab0b5f37ab6b83357a2 SHA512 2b43b11e211ddc10c1362bb5c78abd2c8844f3daf6dbb44ddd0731af596a44f7d5883e4f45e3d29c9b8f545794b8a1f98301565818982dadd8c86ece7fd9b2a1
-EBUILD sanitize-6.0.1.ebuild 755 BLAKE2B 56ec4dcfe6246cc09ccdba55733ea992b9aa5b52d62b8a9117147708d83205408cbce86cb0b2d87db5e15593503779efaf9ad521b9ec619bec1ec8081c72380c SHA512 4a8778fefc6fd73d654657ca4ee533acadf49eb82a590e33aaea74367237d3e49caec5c13e2c3765a8fa9bf296d8287a9882ab06d95ba4cbc8094321c15dc5ee
+EBUILD sanitize-6.0.1.ebuild 762 BLAKE2B 8dd6159223e6942409b1c361a0386646bac66892550616beda33a067d5c07d7cad3ce19d66b8a94f1f2da8ab2f0d666aaebd0d04250003b201c0f8dc5dae34d7 SHA512 988023d10ccf24a175a59d355aafca7094b64b24853b6949fb033ec5d113551fba94d6bd17260bf626f1b3a57d907a4fabc90a4dc854e39e59fd386408e16524
 MISC metadata.xml 342 BLAKE2B 56d8c8d3467a7284a795dbe938e591403576e6e3d4fe675471e2b24b6c2f8520bec8cdea8d7e3182fe6fe8187a6dfb2889befbf5272f76b8f87acc4942a36e9d SHA512 e4257fbb18383d391d7962b3869db25b6875721cad7100dd42f7e10ac72254720c67e1028c13e4fe7517fda833677c1a542e12ff81ba0632b878b851a974c00c
diff --git a/dev-ruby/sanitize/sanitize-6.0.1.ebuild b/dev-ruby/sanitize/sanitize-6.0.1.ebuild
index 9501168de654..88f607dcdccc 100644
--- a/dev-ruby/sanitize/sanitize-6.0.1.ebuild
+++ b/dev-ruby/sanitize/sanitize-6.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 8ade737445ce..622660ce725a 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 5c18d650750f..98554d6bcce5 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -11,5 +11,5 @@ AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ec
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
 EBUILD snack-2.2.10-r11.ebuild 2776 BLAKE2B a6926c255a08e4c0c5dfc188eb42f6b6e1cc665444f3b07656a1e25a07e5cde521ee7cfe53875bec8a9a0d65f77fc1e990145100ad0e43cd5fd3e161db69570f SHA512 8e3384391281be405d4c0419b73a40cd7727c298a1938fb6e2d4ed954d73537ebff26a9c0aa05a42c37e2e076423877ed789acc8346369a19babdf5ef49e7de7
-EBUILD snack-2.2.10-r12.ebuild 2781 BLAKE2B a09e03c8f42808143e0325492d8d4397191fed98a081fbcf82ac2c57345fcf7a4e5c08177fa27af4c6467b4f8f149a87b912096ad05cd8333ea4f4443c28034b SHA512 4a63102ad3c1fd118bb268556afb5ef51fa4cf9521a24ecd5d94a84aae3f8ae1fdecde0bb60dccd0672af600dfc655e09c257af0ce90633b1513c9851089edd2
+EBUILD snack-2.2.10-r12.ebuild 2779 BLAKE2B c46577c93d8cc81ebdf297ce906263835aac310f238dddb3e0261d5637e1dc9026c6402541eac13647710a35038275f12b254d8fd11f2524707aa5f2aaf027e8 SHA512 9fd0db0fcb862f3c8da5c77b4de3be2e55bc657ca787feb8f3fc82d1a805c041bbb22b4b64018e015c2c6d59caf1995e1df1c6cc6fe7f3201be09e82db09e1d2
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/snack/snack-2.2.10-r12.ebuild b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
index 98877b833d37..1c0a69bc0d86 100644
--- a/dev-tcltk/snack/snack-2.2.10-r12.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r12.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 9b461fb42e74..84a388f08586 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -1,5 +1,5 @@
 AUX tclpython-5.0-gentoo.patch 1476 BLAKE2B 86b099a5a30506c4f3dfb4c382a34dbc211b8eceabe039e033d6ec45d80d03bf64a259673ac80f4478b49a55e4605c8387bf17f3c9e3f4467345ca66ba2d98c7 SHA512 abc41ffae87ad1dabbac1dbc747c7df199559aa4d9be9676282d55020d5f1c9bde444ceb59363ddbcb2e786749fa9e42a0192d300be0fd945a01021da2abe8a9
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
 EBUILD tclpython-5.0-r1.ebuild 1015 BLAKE2B 6cfe7f84d570bf93b99f428caefee349f95cc76aa60fa3a2f1b390e1e063296cfd0a4c2a9fb5343c8eca4c37606c4989b4ac21f04bea9d48de421d8ba78bd458 SHA512 b8739544082ba402c035672e86b2eeeeafb7c6701e3b05f37b00efe43c7636e3023e709d569e10342a46c5e0469f02dbde40978e962871f2f809b6dbff226317
-EBUILD tclpython-5.0-r2.ebuild 1018 BLAKE2B 8ab24d3b76b24c94366168b5ba0c5ee3dc6b2be2b4e3aa6d1382a9eb813eae7853fdbce2298159584d9512aa4f9d4f1f24456169458546d32acb60d4fffa07c4 SHA512 a5853753ef5a55a4dd35df58d3c2f05bd2fb25b4a75014428bbca21728d83af68046d43e0a06df0336b0bf71f526e190c06891d65424376a63cbb1e5876e3c7d
+EBUILD tclpython-5.0-r2.ebuild 1015 BLAKE2B 644370d61b4cb895acb0b28fe50f48f28f321ec8a11c75cc49a91c5d5c8fb053b12bba657ddbe4f8b0f3488cc80a85a392f1c4323fabe46724fe01076725e527 SHA512 829e3782785436621af2f057b7716e288550d0d30ebfbc578c10300fa3a4f3fffcd13d2e69a5e13f0162eca8a7e40d5b6365e8113bb92f7359f50f92e3a6806f
 MISC metadata.xml 337 BLAKE2B 3c1da9bcf75dfa06284eddc662e59132d4afc9085ae4327cea50f90bed808266c9857398857a99b8c560110b9339e46a8e74f5e7ce30865474c7aad7aeaaf040 SHA512 065bb7cb172671b9b9cad10777fd6af45f3946c4eb4b7ef34d476f21b93627470c8c9adf21b0d5323495e2787817eaeef9d5b7216da11632ba62a2fb054755d7
diff --git a/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
index 0731a9cc5200..8bdb8a174f15 100644
--- a/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/amykyta3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 46f7865bb0b7..862eb6b894e9 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index fa7dcb9e970a..953d7c6ec975 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,6 +1,6 @@
 DIST ROPgadget-7.2.gh.tar.gz 10092747 BLAKE2B 1a1de7ce06115c8ffb377d3e7c77a268d3e9a158ed9255c02f954da4a0c32732f741e7ca081fa0b75b9a5dce2fa099b8548f26d248ed0285a2290f88dadc848d SHA512 cc3f87a4a331a3c7799f197b8a9056d1da85697a47c57d03cc080aa61d6c8a00775e7f972082f92451439c36ef9d820c982194464f02ec041b5bbeb97fa26f9a
 DIST ROPgadget-7.3.gh.tar.gz 10105592 BLAKE2B b5bfa7bbac6875c2a417c65f3415603c07fda64f96416bba7fc4d6ea653c81b97b7dc4d8573ad53f3353862a218afb15aeaf238880d82a568b6cbe1bb276eb99 SHA512 58457f77c24a1cc4cc703c75aed9303f63ce3eba699210239603e274f134ec06d73b2c519b78176fcaaf6794a81c5a59bb9bafeaa429f7085443372e1087e173
 EBUILD ROPgadget-7.2.ebuild 798 BLAKE2B 43e7e175b68737f065cf0744ad838bcee3a538d096eb1e68267af3b3726f29fdb3d57d4857470360578e4d1e0680fd560954f96b7bfa603fa8460a6a61b7b4c4 SHA512 869af184c90e1a702d8c3e7b9f568cd770303978f594c4e232cb8ce5c1bdaf5637378fd226a1820eebe031230adac188366445affba87ceaf1b9a5f18b8aae56
-EBUILD ROPgadget-7.3.ebuild 800 BLAKE2B 3b6d30a0c542ceac23f7732c12446b1ec7ff3eb769095f308ad5184da1cb3d2e0402ed4ca32300b175be8d816e40529739e10166abebc65702a1563ca4a6b316 SHA512 187566981dae923ec1dc0f8cc1d21297949a0b1f95d18825cbd0b743b5f90be45d800306aef982267b2b750075458b6e9f4c8074b0df5ce78a086522591ccd5a
+EBUILD ROPgadget-7.3.ebuild 798 BLAKE2B 43e7e175b68737f065cf0744ad838bcee3a538d096eb1e68267af3b3726f29fdb3d57d4857470360578e4d1e0680fd560954f96b7bfa603fa8460a6a61b7b4c4 SHA512 869af184c90e1a702d8c3e7b9f568cd770303978f594c4e232cb8ce5c1bdaf5637378fd226a1820eebe031230adac188366445affba87ceaf1b9a5f18b8aae56
 EBUILD ROPgadget-9999.ebuild 800 BLAKE2B 3b6d30a0c542ceac23f7732c12446b1ec7ff3eb769095f308ad5184da1cb3d2e0402ed4ca32300b175be8d816e40529739e10166abebc65702a1563ca4a6b316 SHA512 187566981dae923ec1dc0f8cc1d21297949a0b1f95d18825cbd0b743b5f90be45d800306aef982267b2b750075458b6e9f4c8074b0df5ce78a086522591ccd5a
 MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-7.3.ebuild b/dev-util/ROPgadget/ROPgadget-7.3.ebuild
index ec2cad9d2931..7d7f9a53b554 100644
--- a/dev-util/ROPgadget/ROPgadget-7.3.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
 else
 	SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index c6cbf2dd45b8..effc904816cc 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -4,5 +4,5 @@ DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a0
 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71
 DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596
 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988
-EBUILD android-tools-34.0.0.ebuild 2440 BLAKE2B bd3b8ab952ff97813418915d0fd6831476505a6d4333961edab33422e8dddaa5433f1fafb3ef917f32a0132b3748bdbd6702c80b715d072786846dfded8c35b9 SHA512 50994e477372bf6ee8bb06dd25ccf141b28df03367a51141c4e6fa00581c5a655530b042fb739cffdabfed39dc76786c6cf5522d4933f22ba18b2532422e3f46
+EBUILD android-tools-34.0.0.ebuild 2438 BLAKE2B 59b54a35075efb311afad6b54a70d3091a16bd16fe7d99e23d189784ab40481b89e36d836c076aeb5f134d320051375d7cabc8ff8bd5fa834b95cfa7de5fafae SHA512 019fc5ca93170e7a4441a806940621a2b03cc2e50443a8fe26a458aef1150605bbb5c12fecc45687aed2b64a51cb48369d341deaf325e92c98d15398493974a6
 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75
diff --git a/dev-util/android-tools/android-tools-34.0.0.ebuild b/dev-util/android-tools/android-tools-34.0.0.ebuild
index 499cca3d2025..d8ca6ca82456 100644
--- a/dev-util/android-tools/android-tools-34.0.0.ebuild
+++ b/dev-util/android-tools/android-tools-34.0.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="python udev"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 6ffc9d7a48e1..020311276f6d 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -6,5 +6,5 @@ DIST cproto-4.7v.tgz 193874 BLAKE2B 0fb13ac8f501b9111096666c54ccfa466fe7ecce6f26
 DIST cproto-4.7v.tgz.asc 729 BLAKE2B 577ce738de30ab32099836041fe7b651764750eddee13135a9340410a50c0b46cf8034fb566d31748ea1db8d6d013e4e0c2abecc02d074a998828ce8b00d0fe8 SHA512 b0b03400b79aa04131bfe7176811dcb46cce05d339ab73552b787d9ade26a38e234f6c4f588e5a3cbe3a0521df73a6f7565a3a20181f3b677446ba9379ba8532
 EBUILD cproto-4.7t-r1.ebuild 685 BLAKE2B f51d024f8454f1c4af6a7cc8c602f6cf42f04d6aad04d9c7997518e38d8c66a54b458ec8e90ae13431a13111036b9992ba25eb4129b30d0c00b3fd1a1596608f SHA512 365f226b2d5bc23b1d75aba3f7b8c198d06db544da46e3cf00174bc01315ab44485a006b5ff22578d8402668c503aa7835696649390d4b8a6fa89ef2536ff19d
 EBUILD cproto-4.7u-r1.ebuild 713 BLAKE2B b4c25f8ff024b6570fc4b105fa84ecff5536ba24c5dd9dd3395641d93f3fe648ac482e860fb8041e86b760dc95336ee56f1b2ae86840817a22bcc529a9034b75 SHA512 e08d6bfea22bc18c028f6d7e82e4af0500a25afceccd33373376959e329e8a9b17e7550f1b2663fb542081c86de19c89180f1ea0de93f8e4826537645b87c5dd
-EBUILD cproto-4.7v.ebuild 732 BLAKE2B a885d6b976f288e8c1c346cede183e64769dc4fdeda4110668b3a39779658349a4c1d43d4e54b042ab6541d1bdc3bfe7e4435f4c3b3debbb3e9c437759a77203 SHA512 89705f9adee464b8ebbf87fff392359bc4d8e651c94986577414c7b4c87086a09d6f225814cb03c3cc2ea8fd15bc8065d07c9e68f7692d71c89f8455d4455a6a
+EBUILD cproto-4.7v.ebuild 729 BLAKE2B 4a15e1b84f8d818689d5dd7e8bfa48bccc088ce3150d0e0d2ee67d79abbb88970d97824feceb44e553802bd5f60bfb27fd955e8cf16cf6ea99c69b3019607d13 SHA512 666921646356dd56e25f9f3461acc3c9a52a755e7c21c91defb0fb9463a1b2fc424ff4d476383e98cdaaf94c35d0a0bdb70844ade514d6cf41a41bb37d834690
 MISC metadata.xml 408 BLAKE2B 44cf79171b98215328ec22d1d07768d411832bf5c1bc652c59818b5687bd3a4ee99a6d06d875a9aeba323ef36c8e4c6bb5e191a2e048e4a0546f1cdce3b4db00 SHA512 5792884bc44d07930751c56997483ea9ef2a9543732230dddb22442c028b04108b9826bfaa959743f78a999b4d3e8882946b310f7591ef1ecd96dd908e63eefe
diff --git a/dev-util/cproto/cproto-4.7v.ebuild b/dev-util/cproto/cproto-4.7v.ebuild
index 99cd309dd08c..61004c2d3acc 100644
--- a/dev-util/cproto/cproto-4.7v.ebuild
+++ b/dev-util/cproto/cproto-4.7v.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-alternatives/lex"
 BDEPEND="
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index e9e5daba2c10..abf1d17bdbdb 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,5 @@
 DIST diffuse-0.7.5.tar.gz 509048 BLAKE2B f69d9afea243069bdb9d313059556cc83283cd037e2f32de4b1221a2b53c493cb8a0a9bf8b4fc4d8a50e94fc60fe6043d30e3b5e7b7ceb2cec8529d8e136db0f SHA512 466cdc834e1103ad794979a287838b5005379712ee1d77e400d5fe71dcf5e79097decb39e26b213669077a4a2a525444db99b5587929f01b8b2df9f31ec190fd
 DIST diffuse-0.7.7.tar.gz 620577 BLAKE2B 5c6cf09519e177404dd4d0fd8b27d176581ac08fb9d6dac5b4a90b130f7c28fce0f0f3802a99c7b3078e608f967a36851532d43f5e661854755242b5b23a64e8 SHA512 bf9576734ebd696252732b3b0ce6f1f18508a800520388459d9f27482a43251db879c2198c3a279bad9528afc08cf8e7f23a3253b58edad049db9b1c697fd6e0
 EBUILD diffuse-0.7.5.ebuild 1460 BLAKE2B 405a3c3da153d8e7686d2230905590b415b31dcbd04b8c70359f2ba0234fd827e7ff417eb8d3ce762b5255c1c12238fcb0d19c061f4ba9b715554ea2b2acc4db SHA512 e867b539c63292e9f5e96225a542bef4d4330c1f71036dde5112857f508844f47f918d768f01526771c25c3cded31c77255f970cb2c2834c3942e9e4f222e3ae
-EBUILD diffuse-0.7.7.ebuild 1462 BLAKE2B c5cccff3b16d6aaabcf71cb934fcd5f923c5edf703dc0ea7c94defa6729a47b2a8f504ea935beb554741ee1c0bb48d8ff7109db0faa9a3214e9e79f73fb7d53b SHA512 74f37c0a6541fe6b82eeed738047c0323ca37e19eee800d8bea3bf1e28fa261ed808fbb0b57293109c1a8f9e274b9f0e540e666c37075c91be96918610c043df
+EBUILD diffuse-0.7.7.ebuild 1461 BLAKE2B 50bf0e05f4fba26e1b0eb481c9f4051078e26da781430373e22d0d429b6b6b0d9bfac8702ed5a6f155247c88debf2148bb79fcbf8a4fb6a1ec6a503fdbb614b9 SHA512 0b08ca0ad8ee9cda56dfc11fdc827d4f2cc8be1f5513972118b02065853f37457f975e287f3a5927cd9e0a6ebcd874470d73aa9b75e0f9d03e829fd23c674009
 MISC metadata.xml 324 BLAKE2B f4889c3b688d5c75efaef149b263839d073cc9bb5af34143db1fe800459b42a4a2676e03af21bdff14e75a85e9cf20a8e2e6d9447678c45a849798e35d587811 SHA512 24b6f7a5010dea044356f4fec287c0faeae4d3aa7ed79c3d436c28e12edce917f5c34597d7efab39dd59b907baab8cacfd942e61ccf843248df093092cdacd32
diff --git a/dev-util/diffuse/diffuse-0.7.7.ebuild b/dev-util/diffuse/diffuse-0.7.7.ebuild
index 4b47edc65ee9..6e24a239ad9a 100644
--- a/dev-util/diffuse/diffuse-0.7.7.ebuild
+++ b/dev-util/diffuse/diffuse-0.7.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MightyCreak/diffuse/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/fq/Manifest b/dev-util/fq/Manifest
index bc21b8db1e37..0090d1d824a9 100644
--- a/dev-util/fq/Manifest
+++ b/dev-util/fq/Manifest
@@ -8,6 +8,6 @@ DIST fq-0.5.0-deps.tar.xz 23548612 BLAKE2B 2ad41a19b4f600df4ef1ad4e900d037d5df2b
 DIST fq-0.5.0.tar.gz 14043325 BLAKE2B a69d2f8602c8a1def0aff3c291e6ace23509e53a96c3b0e11e0353bc8a35cdd7ca6a8c8d1d72557e1c6895154d5e62070a7cd35ac76224c676c7e708e512d349 SHA512 21d0d23c21d12188bff10845b1c31cc8535f31ccef54d2b3e5b9b9770d6d0c830a9d83db3fb7f6559e940227bdcd8fdb3df45eccc2ab4cfe2e36214585e21343
 EBUILD fq-0.2.0-r1.ebuild 942 BLAKE2B ea4d2d52f01d9755017efa28328962ee53200b0bf3b8a038a2ca88042cdde44516839fc9dc1213b1d84599948c9e435205f563a9c848a7e90ef6ecbd00384ecc SHA512 89622e1bf2898438250b808e8398581fd0e1973233a77f7d94b26071e19f41dac107292bd9e5dde9bebd4f4e8c236448e45bec808714832fedcef4ae1c03ae28
 EBUILD fq-0.3.0.ebuild 859 BLAKE2B 9b2338e2c6dede9cd39e49b7a22a4b3088debf3361307d374fd09196179d586d9c27895d7ed55c4f58df61082008346edc0998d7b1f3dcbf6db57a95da6db673 SHA512 a4d769cb953b338d9261253b972807deadd6939ee1f271f772c3779d690f7b9209831237c7b865738db64aa39dbe3c12322186d8f41e1a361f638667d11609f3
-EBUILD fq-0.4.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
+EBUILD fq-0.4.0.ebuild 859 BLAKE2B 9b2338e2c6dede9cd39e49b7a22a4b3088debf3361307d374fd09196179d586d9c27895d7ed55c4f58df61082008346edc0998d7b1f3dcbf6db57a95da6db673 SHA512 a4d769cb953b338d9261253b972807deadd6939ee1f271f772c3779d690f7b9209831237c7b865738db64aa39dbe3c12322186d8f41e1a361f638667d11609f3
 EBUILD fq-0.5.0.ebuild 860 BLAKE2B 118ad811631095bb7fd2b80ca52a826f8ee54c213e18c919bd4dfc18f9a4e5ec54a41f28d0e906e98b3760e7c2b7e3a05c76d78145d22a846f983d7644f2e891 SHA512 c04502e39c0ce7deeb17f3293f8bb84089588226691bb51077bb10058e26e42d8ac0c3786623be0965973a3213185608fed4963cf65e7c79124e5ac3671e53a6
 MISC metadata.xml 313 BLAKE2B 49888cd21e49fca7d7913fbd265cbffd73dcfaa5080e09ccd1f5b9c62804e5b9fb1de1e21df96609079c18c481b2847897b4fe1a9fc499d0e6dc2559e677a27f SHA512 1d125e77b24aeffe27b0d54b8b9f247e1e2b62037bdb127f232d3089d63e1b92c2062e37446067850defc382d7e49785152e9af86cd46f44827e2e037dd291a7
diff --git a/dev-util/fq/fq-0.4.0.ebuild b/dev-util/fq/fq-0.4.0.ebuild
index 5df96c3f076c..ac1877d19d56 100644
--- a/dev-util/fq/fq-0.4.0.ebuild
+++ b/dev-util/fq/fq-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar
 
 LICENSE="MIT BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 63cd1b967b14..3eb901121b68 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,6 +1,8 @@
 AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971
 DIST gn-0.2049.tar.xz 727960 BLAKE2B fe93d09c1fa5b6267a4d26f37ec42e629b36645ef58bf6ebcc07dd8cd2ee9509c1e997182251a3e2c3ef3c5b7d636c9a8228c1e49d1d7245b3ebdac36e7c5a1a SHA512 f3e6dc87d647702c5d22793e2eed3e9950f8c9a6d7178eae67bb7d6518b6533c74fa3f43245fb9e422994a27f1a0f1986709f91e7ce2ed78eb5f17838f75e1db
 DIST gn-0.2077.tar.xz 735596 BLAKE2B 48da6c1b08746d364974c94a8395708ba44f4fb88a4bd6142d8ce3935608538b3e3d316c1b3934b124bb2af8549e0bc355b4f0990ab0b794adca025a4c3db7c5 SHA512 361fa1d71f4c4ed12fec8136fb79ee8d30cd8c9b93f2d9972222e028a8b74326045f000431863c6d7ab598b1d7b06c00c95793830da48f52e623a1246bcc8bc4
+DIST gn-0.2088.tar.xz 736408 BLAKE2B 23cb932c6fa1711472e0369b5c9271dd28b1d1a8eee40366295ea576fb0d913f3e01dd802df718d6d55ad27b566b0fae5da0cb03167e38df46bbda284b26f99c SHA512 be1d0a0095a7de9fc130935d45c610ab77dd9451822b33c344ac79d096828752bab04b81183eaa35b654abbb76748ce13751c04d44968d08643b6cd89f3fe8f7
 EBUILD gn-0.2049.ebuild 1314 BLAKE2B 0f18a123a6ea07c2bf9fbaaa854679f12db7ba38ae154a7dd5124f963891e10a1653dac8f582ba0549f7dc7feb9c84cc16e4d2069b980ee7a221ae14eb8c0d82 SHA512 674a875512675c60a0ddd8576b47ffd927db2ed8fa76665dd7941cb38661b7317c6927f6c0410a01cd3d90b6300d155a78d0b87c7c036ed767b3abc88c87c4e9
 EBUILD gn-0.2077.ebuild 1316 BLAKE2B 29c222f0435a87914dbd0f9837aecb94e401fcee0bb2c48945491652b4c81ef03a67e2cc8e3a38c985f7b943c2eb85540ec29d3db52c13dd2e08e08c6b91cb2a SHA512 0a389b3bd5102321311b4ba5bb102079248930c47f929bdeeaf2014e7a7007ba60e9dae757023f1e4fce0ae737167814750c174dc76c1242f0dc5d41185b2144
+EBUILD gn-0.2088.ebuild 1270 BLAKE2B dcf621b8d70e5a691429145a81568d4fab14fa0b32ef52c5f333e1a8d96c89946c09b44bd2cbf3f97d4a35d56042a025866b29bbb383db033b3d2edd7e7369aa SHA512 29bb1d08567edb941f08f9deea01316769031252e7cc74fd3dbf66a526fc837c58732dc976f85909d59f99a3747b48a5da43a250e73c87c60c638dd3fcb753cc
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-util/gn/gn-0.2088.ebuild b/dev-util/gn/gn-0.2088.ebuild
new file mode 100644
index 000000000000..a68b570ed9b3
--- /dev/null
+++ b/dev-util/gn/gn-0.2088.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r5.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings
+	echo "$@" >&2
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	insinto /usr/share/vim/vimfiles
+	doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
+}
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
index e6f1b24d327a..def0f387eb88 100644
--- a/dev-util/ignition-cmake/Manifest
+++ b/dev-util/ignition-cmake/Manifest
@@ -1,3 +1,3 @@
-DIST ignition-cmake2-2.14.0.tar.bz2 199069 BLAKE2B 4b73878bc364b0274dd3828b9dba2eaa7ae27d96c8512bf70a83a3b8bdfd60c7b2653eb3d65a4ee2bc42739e0fa5f0627d371ebba291cfd5aade511c1bbe17ff SHA512 2c4d3a7c7715927806115de4496a1f03a01627a6fc2aef150b7cd6caf0384aa14d3f6ed4673ba0575ee5cf7dafbab8c42971ff45c07d8b8ff3a1b444dbdf1763
-EBUILD ignition-cmake-2.14.0.ebuild 561 BLAKE2B 7e7fcef148fc86dd320f0027e98c38f1bf1b6dfb9be0c6d62b99a0cd3bb3972fa40dae9250718867aa1fba6291b95facba466333d03967803a342d71743d3820 SHA512 e04f619ce336eeeb7bb77a7bc83c0a70b0f1c9635cefc801ad9ccfd67ff1f86fb6d10fff26fab2903e74ff85d04785e65d45ff3d3e319e7ec8f81f1c1c65307a
+DIST ignition-cmake2-2.16.0.tar.bz2 209182 BLAKE2B 8ee21bedfbaa35ef3ea6a758de074e72b1b2003531ca5900310ef4b34bf95f7e2d49ca8cb3d023a86810e302eb11e4edbc1769e03cb58ddedb74819a520b3177 SHA512 c391112b9120bb415a596f8258da173949b62f3d28e216d1c94d2c3ec05062c6999148ef03ce2653d0ca21e70f66d991ec1d0fe105d280eb19aee57530b34896
+EBUILD ignition-cmake-2.16.0.ebuild 561 BLAKE2B 662eb33b4b3678e79e8b0f8f507b84e267583777136d29e1a1d7f40c4500a43f6237a96c71a85ad13976f0775c5e89e12501aafd001e1a54a124fe5c6ada8250 SHA512 51317a3f81ba76e81df312d35538f9e467d213e6266821804bf083f90690b3e0533f3025fa1fa98946115e09f6eb85086f1f2aba6e2bd8d8f282b14f516fd559
 MISC metadata.xml 344 BLAKE2B eb8afca0f974e866dda5b868b3c8742afa4cfb4b083ca7c0ecb02ed0c8bde8bab03d4e115a7727a4e897171b45f6ff43201f52ce94ce32af86e1a2cc4fa2ad9c SHA512 efbb43f77622518ea4d99734bcd87954f5bcf50b848c9d63dddc009bfad612304ae6ac8c1317c961d88d115df16150f1dbb7cbc61e048ad426f04b451c6dbd58
diff --git a/dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
similarity index 93%
rename from dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild
rename to dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
index ce0125bc0d02..0706fbd7174d 100644
--- a/dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild
+++ b/dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 00cd00acef54..74bca5ef314e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,5 +2,7 @@ AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
+DIST intel-graphics-compiler-1.0.13822.1.tar.gz 8356125 BLAKE2B 248bbf34031059506b6e41a07bb3ef0d849f388b660488345d0e21594994f7faa8d498d8f60ba0298c82f7cdf66839bc25bd9bb5856ab273b02fb415e9801176 SHA512 c0705b86955fe6cd38f4756bdd5029ff6ed62305d58b99184d85261b0ed0d9699a176fe414bbafb5e987b831d13d0e6709b1e83a442519500c7d66c049386baa
 EBUILD intel-graphics-compiler-1.0.13463.1.ebuild 2518 BLAKE2B 832fbeddffb0b3f9610772b6d79f37479b8d6a927a32241d42c6a27f5054f32d2668f2cfac90a3833efc7e84807e350f2b70af682e11cb55d9bda1abf9ef86b5 SHA512 f605a5cb37772bebf8d40519608066a48bae3eb3a920be953f5fc721ff1c5f62f3e6d95090db55e9df4a65e272ee566ce150755ae38ffeed8c448167dffc82d4
+EBUILD intel-graphics-compiler-1.0.13822.1.ebuild 2519 BLAKE2B c323208d37fe7d77b5562ba9e449db3c1a5104a471c6dc02905e9cd9c5acc3293da9fc9b81175518216265be68a29ed82b178039161e946d3d805c2136b172b8 SHA512 97a7851ff771d94424a26ef91a0ca87ae34be731a10c91db39b9d5d6f9aa569ca045d0e9255bc7cc14286e0dd1df462c90ac362eec2041beb735b5572360ec43
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
new file mode 100644
index 000000000000..7715b2c3fbdd
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.11.0
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 7eeb217e33d2..905988dd2ee0 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.1.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
-EBUILD lldb-16.0.2.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
+EBUILD lldb-16.0.2.ebuild 2668 BLAKE2B 9c511f2ec5e6c0636d3de8c9c306dcc444efa8bc3e35c278763b3123ec6a400467ef68921ff41f1c731362f58bb6dc72dbd536bfe52758de6ea7f7e0b85c0a07 SHA512 fc19cffc5826458d7981dfbaa5e687d39d7c66ee40857bdca9e0ece371198f9537eef7f3f885d1357f7e995d73d1586d3c8b58ccce486d3264859166e1786dbf
+EBUILD lldb-16.0.3.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0.9999.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0_pre20230325.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
 EBUILD lldb-17.0.0_pre20230414.ebuild 2638 BLAKE2B 51de1cf5b670f27a05412689befeb35a2cc2dcc4f24d06552459384b240a352b7be168338d738657f9c0d5a2123ec6c4fb6a6454e6fe6c71489f0d036985dedb SHA512 133ebff79c2452ed3b198c9ece259de10d4267b039d076a210d7a2ee627d12c8a05f7a37b692cbf732fe78e488daac6c37c9542a92dd765ecba292ca12310e10
diff --git a/dev-util/lldb/lldb-16.0.2.ebuild b/dev-util/lldb/lldb-16.0.2.ebuild
new file mode 100644
index 000000000000..e4e43bb0ef2f
--- /dev/null
+++ b/dev-util/lldb/lldb-16.0.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb cmake llvm/utils )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LUA=OFF
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-16.0.2.9999.ebuild b/dev-util/lldb/lldb-16.0.3.9999.ebuild
similarity index 100%
rename from dev-util/lldb/lldb-16.0.2.9999.ebuild
rename to dev-util/lldb/lldb-16.0.3.9999.ebuild
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index 63f543c6c415..ee1804a54bd2 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -177,7 +177,6 @@ DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692
 DIST lzxd-0.1.4.crate 21891 BLAKE2B 8271b79bdf6c65a17b5fe77a4d8b7d3a96ccf1752d211770dcccbd0912b0113740f5175b6d587ef5f5768b7ecd073488fca4f49e5c4bb3ec4cc9e5055e471b99 SHA512 f4fc473056dc793ee938943646416c3a93c748104093b8932c0a603a5f25820b49632f703ea4bc248b8bd612ef51dce4f5798f1f46782466c38aa69d016c2c57
 DIST mailparse-0.13.8.crate 36008 BLAKE2B 8112658b4ceb5b3528375f4f8a178a26c18b5494ba582c333e09de6263769869b5a4903ec2d62cab7a032635fa5d28f00f3f80337b968221e386e252f842cf36 SHA512 c7557f741c170c421d5ccef8cb771fce544b3f3da0475b170f82116c00cdd7522fe29fc8bb4dfa20735345b2c72e12af0bcc4317d9ada412b59f9ff4266e14ac
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
-DIST maturin-0.14.16.gh.tar.gz 392189 BLAKE2B 8731fa1ef7ebb6d1645f25ab431cc53d66748a8a54f6d9ea690a09bd753ca15063eeba90296aeac1fd2360feef168c9e64f9ec1b5224e72063c4949a58f876a8 SHA512 8e7e5739b9ff46989011035634c29aa390c60dd5b109f41dcd47bdf6ffb7081bf5ebc160cbae6647baeaa4d3f209167f48ea52ea9b3b676e978617d28bb9c121
 DIST maturin-0.14.17.gh.tar.gz 392461 BLAKE2B 4d0d2d5101a05017883b27dca270c3f3b84c77dd53f19db04c2b5a988b699f3b39b6b7a88c7ac02b5e322679f5509bdf68b5c5f27ec229816c394ebc5fb57fd8 SHA512 d12503530b0d865b6b3c40e564742d0e798107102fb7167c137c1b0a4fa63bfad739320901cff15a680a09034aae553c3cd55cf0c8f1d3ed0fd96404bb93cbfe
 DIST maturin-1.0.0_beta7.gh.tar.gz 419642 BLAKE2B 3844d76576b3c86091c34a3aeb88f448cdca18fbd2151340d297fa9c86e27096b138cdd9f998fe5a5ed860406809c300ddf26562cc67a52689b4e994592522de SHA512 f6d5f675dbfe2fd8411444590d3e979ea9e31ae1d37be5ca42dad6eda92ad5d9598adc0dc760f83af5a3f6ec54cbd37ebed10707ec0251006f083b14fce60083
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
@@ -483,7 +482,6 @@ DIST zeroize-1.5.7.crate 18861 BLAKE2B 5f203d91aae732b928e2acd02656a486f0f930b8d
 DIST zip-0.6.4.crate 62396 BLAKE2B cfe4d7fcdb71ee6da3b6bf6f8cf4ecca9f717f7bbe96307af943c1b3d75dc233f1ae0df2f8515356da2fa27c0bcb534ee73c72e7afced4ae997b888c9078e149 SHA512 29392175711fb8585d400f99798596e10415423b3fda245069ca3144bce4b1027db845526c233bcf8be13b756e9605df21657bd2b5713339adeb334fe964ff8e
 DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc715b1395cafe6386553a52e9a72d08c3a599bc08d5f563ea71324f1e7d60db2797c3ad1ad23a9c322a3939346 SHA512 48227afe709c1cc54cb70b4d9ae26e7f836559b4b11a68136d7720d01bacf757c1f5f40cad9de634fa27e196e4942df69c33a7de1334bb23ca995ea34690c5ba
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
-EBUILD maturin-0.14.16.ebuild 10078 BLAKE2B 21fafcff8200d77969ed07c3025a7847105ce0009e8edcef01ca48ef5e628961af3127be432014aeed9fa8252494ba71be6f9b8a8d0e8c3db70e50ddbe30c397 SHA512 9d6fdf6f349453efc1fbc2355a51371fb21739708ae2ef1791b5dffc947891ddbda85ed14a1240ed5200662f0bd0b3043d87dceea14f2550b1afae8e469808d4
-EBUILD maturin-0.14.17.ebuild 10079 BLAKE2B fe1c7e22a09d4866470b801772714dabbae8c715c80709bdaea840296905c79ded4d18362fddcd9251791870ac46861b32d3243339b26e862c20dd02c80c4cd1 SHA512 c2717b2f54817b4ac6e01e9596b32a39c0fea76743845e66048f67f73826b66251fce7701a7663a3c9647af43665700bca24d7b674470d4d9bd62d480078627d
+EBUILD maturin-0.14.17.ebuild 10078 BLAKE2B 21fafcff8200d77969ed07c3025a7847105ce0009e8edcef01ca48ef5e628961af3127be432014aeed9fa8252494ba71be6f9b8a8d0e8c3db70e50ddbe30c397 SHA512 9d6fdf6f349453efc1fbc2355a51371fb21739708ae2ef1791b5dffc947891ddbda85ed14a1240ed5200662f0bd0b3043d87dceea14f2550b1afae8e469808d4
 EBUILD maturin-1.0.0_beta7.ebuild 9907 BLAKE2B 645e072777ae0de2928342187cab5bb59a9c3ed0f290cad5688e27a790923bae86a5a3b4e8971a000fc021d8c96eb137f05c2273f970c47b025f4aeec210d67d SHA512 d14e9f1e6465b776552428ed924e214fdd93b957278b235d3ca0e10099b7420e5e43bed8935a16d2841a952f02fb4593fd1592432faf473fa95af3b59487c18a
 MISC metadata.xml 644 BLAKE2B 68c4178fb0120813b880155cf6660aa7092335e3cd0daa9a112ad7f00fb081c8076cfb30c2b7299797fba0929dc2b223585da6f9c57d28e1b9d91e2d40843355 SHA512 9fa1da4be0fc70d10a6aaf6381a0d211a14807f0335660b501f86d2e750e93f76d31ae9b141aa0a170cb5ef36d52fd744c75dc4342226c2179e07f579d108ff7
diff --git a/dev-util/maturin/maturin-0.14.16.ebuild b/dev-util/maturin/maturin-0.14.16.ebuild
deleted file mode 100644
index a11110863f30..000000000000
--- a/dev-util/maturin/maturin-0.14.16.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-1.0.2
-	aes-0.7.5
-	ahash-0.3.8
-	ahash-0.7.6
-	aho-corasick-0.7.20
-	anyhow-1.0.69
-	askama-0.11.1
-	askama_derive-0.11.2
-	askama_escape-0.10.3
-	askama_shared-0.12.2
-	async-io-1.12.0
-	async-lock-2.7.0
-	autocfg-1.1.0
-	base64-0.13.1
-	bincode-1.3.3
-	bitflags-1.3.2
-	block-buffer-0.10.3
-	block-buffer-0.9.0
-	block-modes-0.8.1
-	block-padding-0.2.1
-	bstr-1.2.0
-	bumpalo-3.12.0
-	byteorder-1.4.3
-	bytes-1.4.0
-	bytesize-1.2.0
-	bzip2-0.4.4
-	bzip2-sys-0.1.11+1.0.8
-	cab-0.4.1
-	camino-1.1.3
-	cargo-options-0.5.3
-	cargo-platform-0.1.2
-	cargo-xwin-0.13.3
-	cargo-zigbuild-0.14.3
-	cargo_metadata-0.15.3
-	cbindgen-0.24.3
-	cc-1.0.79
-	cfb-0.7.3
-	cfg-if-1.0.0
-	charset-0.1.3
-	chumsky-0.8.0
-	cipher-0.3.0
-	clap-4.0.32
-	clap_complete-4.0.7
-	clap_complete_command-0.4.0
-	clap_complete_fig-4.0.2
-	clap_derive-4.0.21
-	clap_lex-0.3.0
-	cli-table-0.4.7
-	concolor-0.0.11
-	concolor-query-0.1.0
-	concurrent-queue-2.1.0
-	configparser-3.0.2
-	console-0.15.5
-	const-random-0.1.15
-	const-random-macro-0.1.15
-	content_inspector-0.2.4
-	core-foundation-0.9.3
-	core-foundation-sys-0.8.3
-	cpufeatures-0.2.5
-	crc32fast-1.3.2
-	crossbeam-channel-0.5.6
-	crossbeam-deque-0.8.3
-	crossbeam-epoch-0.9.14
-	crossbeam-utils-0.8.15
-	crunchy-0.2.2
-	crypto-common-0.1.6
-	crypto-mac-0.11.1
-	ctor-0.1.26
-	data-encoding-2.3.3
-	derivative-2.2.0
-	dialoguer-0.10.3
-	diff-0.1.13
-	digest-0.10.6
-	digest-0.9.0
-	dirs-4.0.0
-	dirs-sys-0.3.7
-	dunce-1.0.3
-	either-1.8.1
-	encode_unicode-0.3.6
-	encoding_rs-0.8.32
-	enumflags2-0.6.4
-	enumflags2_derive-0.6.4
-	errno-0.2.8
-	errno-dragonfly-0.1.2
-	event-listener-2.5.3
-	fastrand-1.9.0
-	fat-macho-0.4.6
-	filetime-0.2.19
-	flate2-1.0.25
-	fnv-1.0.7
-	foreign-types-0.3.2
-	foreign-types-shared-0.1.1
-	form_urlencoded-1.1.0
-	fs-err-2.9.0
-	futures-0.3.26
-	futures-channel-0.3.26
-	futures-core-0.3.26
-	futures-executor-0.3.26
-	futures-io-0.3.26
-	futures-lite-1.12.0
-	futures-macro-0.3.26
-	futures-sink-0.3.26
-	futures-task-0.3.26
-	futures-util-0.3.26
-	generic-array-0.14.6
-	getrandom-0.2.8
-	glob-0.3.1
-	globset-0.4.10
-	goblin-0.6.1
-	hashbrown-0.12.3
-	heck-0.4.1
-	hermit-abi-0.2.6
-	hkdf-0.11.0
-	hmac-0.11.0
-	humantime-2.1.0
-	humantime-serde-1.1.1
-	idna-0.3.0
-	ignore-0.4.18
-	indexmap-1.9.2
-	indicatif-0.17.3
-	indoc-2.0.0
-	instant-0.1.12
-	io-lifetimes-1.0.4
-	is-terminal-0.4.2
-	itertools-0.10.5
-	itoa-1.0.5
-	js-sys-0.3.61
-	keyring-1.2.1
-	lazy_static-1.4.0
-	lddtree-0.3.2
-	libc-0.2.139
-	linux-raw-sys-0.1.4
-	lock_api-0.4.9
-	log-0.4.17
-	lzxd-0.1.4
-	mailparse-0.13.8
-	matchers-0.1.0
-	memchr-2.5.0
-	memoffset-0.6.5
-	memoffset-0.8.0
-	mime-0.3.16
-	mime_guess-2.0.4
-	minijinja-0.30.5
-	minimal-lexical-0.2.1
-	miniz_oxide-0.6.2
-	msi-0.5.1
-	multipart-0.18.0
-	native-tls-0.2.11
-	nb-connect-1.2.0
-	nix-0.22.3
-	nom-7.1.3
-	nom8-0.2.0
-	normalize-line-endings-0.3.0
-	normpath-1.0.1
-	nu-ansi-term-0.46.0
-	num-0.4.0
-	num-bigint-0.4.3
-	num-complex-0.4.3
-	num-integer-0.1.45
-	num-iter-0.1.43
-	num-rational-0.4.1
-	num-traits-0.2.15
-	num_cpus-1.15.0
-	number_prefix-0.4.0
-	once_cell-1.17.1
-	opaque-debug-0.3.0
-	openssl-0.10.45
-	openssl-macros-0.1.0
-	openssl-probe-0.1.5
-	openssl-src-111.25.0+1.1.1t
-	openssl-sys-0.9.80
-	os_pipe-1.1.2
-	os_str_bytes-6.4.1
-	output_vt100-0.1.3
-	overload-0.1.1
-	parking-2.0.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.6
-	paste-1.0.11
-	path-slash-0.2.1
-	pep440-0.2.0
-	percent-encoding-2.2.0
-	pin-project-lite-0.2.9
-	pin-utils-0.1.0
-	pkg-config-0.3.26
-	plain-0.2.3
-	platform-info-1.0.2
-	polling-2.5.2
-	portable-atomic-0.3.19
-	ppv-lite86-0.2.17
-	pretty_assertions-1.3.0
-	proc-macro-crate-0.1.5
-	proc-macro-crate-1.2.1
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.20+deprecated
-	proc-macro2-1.0.51
-	pyproject-toml-0.3.1
-	python-pkginfo-0.5.5
-	quote-1.0.23
-	quoted_printable-0.4.7
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	rayon-1.6.1
-	rayon-core-1.10.2
-	redox_syscall-0.2.16
-	redox_users-0.4.3
-	regex-1.7.1
-	regex-automata-0.1.10
-	regex-syntax-0.6.28
-	rfc2047-decoder-0.2.1
-	ring-0.16.20
-	rpassword-7.2.0
-	rtoolbox-0.0.1
-	rustc_version-0.4.0
-	rustix-0.36.7
-	rustls-0.20.8
-	rustversion-1.0.11
-	ryu-1.0.12
-	same-file-1.0.6
-	schannel-0.1.21
-	scoped-tls-1.0.1
-	scopeguard-1.1.0
-	scroll-0.11.0
-	scroll_derive-0.11.0
-	sct-0.7.0
-	secret-service-2.0.2
-	security-framework-2.8.2
-	security-framework-sys-2.8.0
-	semver-1.0.16
-	serde-1.0.152
-	serde_derive-1.0.152
-	serde_json-1.0.93
-	serde_repr-0.1.10
-	sha2-0.10.6
-	sha2-0.9.9
-	sharded-slab-0.1.4
-	shell-words-1.1.0
-	shlex-1.1.0
-	similar-2.2.1
-	siphasher-0.3.10
-	slab-0.4.8
-	smallvec-1.10.0
-	smawk-0.3.1
-	snapbox-0.4.4
-	snapbox-macros-0.3.1
-	socket2-0.4.7
-	socks-0.3.4
-	spin-0.5.2
-	static_assertions-1.1.0
-	strsim-0.10.0
-	subtle-2.4.1
-	syn-1.0.109
-	tar-0.4.38
-	target-lexicon-0.12.6
-	tempfile-3.4.0
-	termcolor-1.2.0
-	terminal_size-0.2.3
-	textwrap-0.16.0
-	thiserror-1.0.38
-	thiserror-impl-1.0.38
-	thread_local-1.1.4
-	time-0.3.17
-	time-core-0.1.0
-	time-macros-0.2.6
-	tiny-keccak-2.0.2
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.0
-	toml-0.5.11
-	toml_datetime-0.5.0
-	toml_edit-0.17.1
-	tracing-0.1.37
-	tracing-attributes-0.1.23
-	tracing-core-0.1.30
-	tracing-log-0.1.3
-	tracing-serde-0.1.3
-	tracing-subscriber-0.3.16
-	trycmd-0.14.10
-	twox-hash-1.6.3
-	typenum-1.16.0
-	unicase-2.6.0
-	unicode-bidi-0.3.10
-	unicode-ident-1.0.6
-	unicode-linebreak-0.1.4
-	unicode-normalization-0.1.22
-	unicode-width-0.1.10
-	uniffi_bindgen-0.22.0
-	uniffi_checksum_derive-0.22.0
-	uniffi_meta-0.22.0
-	uniffi_testing-0.22.0
-	untrusted-0.7.1
-	ureq-2.6.2
-	url-2.3.1
-	uuid-1.3.0
-	valuable-0.1.0
-	vcpkg-0.2.15
-	version_check-0.9.4
-	versions-4.1.0
-	wait-timeout-0.2.0
-	waker-fn-1.1.0
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.84
-	wasm-bindgen-backend-0.2.84
-	wasm-bindgen-macro-0.2.84
-	wasm-bindgen-macro-support-0.2.84
-	wasm-bindgen-shared-0.2.84
-	web-sys-0.3.61
-	webpki-0.22.0
-	webpki-roots-0.22.6
-	weedle2-4.0.0
-	wepoll-ffi-0.1.2
-	which-4.4.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.1
-	windows_aarch64_msvc-0.42.1
-	windows_i686_gnu-0.42.1
-	windows_i686_msvc-0.42.1
-	windows_x86_64_gnu-0.42.1
-	windows_x86_64_gnullvm-0.42.1
-	windows_x86_64_msvc-0.42.1
-	xattr-0.2.3
-	xwin-0.2.10
-	yansi-0.5.1
-	zbus-1.9.3
-	zbus_macros-1.9.3
-	zip-0.6.4
-	zvariant-2.10.0
-	zvariant_derive-2.10.0"
-# additional crates used by test-crates/* test packages,
-# `grep test-crates tests/run.rs` to see which are needed
-CRATES_TEST="
-	anyhow-1.0.66
-	bytes-1.3.0
-	camino-1.1.1
-	cargo_metadata-0.15.2
-	cc-1.0.73
-	cc-1.0.74
-	glob-0.3.0
-	goblin-0.6.0
-	heck-0.4.0
-	indoc-1.0.7
-	itoa-1.0.4
-	libc-0.2.134
-	libc-0.2.137
-	nom-7.1.1
-	once_cell-1.15.0
-	once_cell-1.16.0
-	parking_lot_core-0.9.3
-	parking_lot_core-0.9.4
-	paste-1.0.10
-	proc-macro2-1.0.46
-	proc-macro2-1.0.47
-	pyo3-0.18.1
-	pyo3-build-config-0.18.1
-	pyo3-ffi-0.18.1
-	pyo3-macros-0.18.1
-	pyo3-macros-backend-0.18.1
-	python3-dll-a-0.2.6
-	quote-1.0.21
-	ryu-1.0.11
-	semver-1.0.14
-	serde-1.0.151
-	serde_derive-1.0.151
-	serde_json-1.0.89
-	syn-1.0.102
-	syn-1.0.103
-	syn-1.0.105
-	target-lexicon-0.12.4
-	thiserror-1.0.37
-	thiserror-impl-1.0.37
-	toml-0.5.10
-	unicode-ident-1.0.5
-	uniffi-0.22.0
-	uniffi_build-0.22.0
-	uniffi_macros-0.22.0
-	unindent-0.1.10
-	windows-sys-0.36.1
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.36.1
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.36.1
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.36.1
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.36.1
-	windows_x86_64_msvc-0.42.0"
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-inherit cargo distutils-r1 flag-o-matic
-
-DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
-HOMEPAGE="https://www.maturin.rs/"
-SRC_URI="
-	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
-
-LICENSE="
-	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD
-	CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl
-	doc? ( CC-BY-4.0 OFL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{9..10})"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	doc? ( app-text/mdbook )
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/cffi[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/boltons[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# used to prevent use of network during tests
-	cat > "${T}"/pip.conf <<-EOF || die
-		[install]
-		no-index = yes
-		no-dependencies = yes
-	EOF
-
-	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
-	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
-
-	# setup.py handles most for non-tests, but ensure rustls is disabled except
-	# on arches where ring crate should work (keep in sync below, bug #859577)
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die
-	fi
-}
-
-src_configure() {
-	filter-lto # undefined references with ring crate
-
-	if use !amd64 && use !x86 && use !arm64 && use !arm; then
-		local myfeatures=( upload log )
-		cargo_src_configure --no-default-features
-	fi
-}
-
-python_compile_all() {
-	use !doc || mdbook build -d html guide || die
-}
-
-python_test() {
-	local -x COLUMNS=100 # what tests/cmd was generated for
-	local -x MATURIN_TEST_PYTHON=${EPYTHON}
-	local -x PIP_CONFIG_FILE=${T}/pip.conf
-	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
-
-	local skip=(
-		# avoid need for wasm over a single hello world test
-		--skip integration_wasm_hello_world
-		# fragile depending on rust version, also wants libpypy*-c.so for pypy
-		--skip pyo3_no_extension_module
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-python_install_all() {
-	dodoc Changelog.md README.md
-	use doc && dodoc -r guide/html
-}
diff --git a/dev-util/maturin/maturin-0.14.17.ebuild b/dev-util/maturin/maturin-0.14.17.ebuild
index f921beab6e59..a11110863f30 100644
--- a/dev-util/maturin/maturin-0.14.17.ebuild
+++ b/dev-util/maturin/maturin-0.14.17.ebuild
@@ -415,7 +415,7 @@ LICENSE="
 	CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl
 	doc? ( CC-BY-4.0 OFL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 616da5cc8654..fac138562e62 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,3 +1,4 @@
+AUX binutils-2.40-import-lib.patch 1213 BLAKE2B e01bcad336f99e173579261950aa28eaac22b0e3bcf30c0cf567b5324d1b8294646d62ffa406ddd14a448a32f6bc81fcab3c50d64e2a09beed5cec9f7b8d4085 SHA512 8ead67c0059dbd51bfb0e47e473656ece9be31427e366f6bb18ac1324d7d79a6d3004664573c895b6119a708c8b5cdbf11703d59251d4e24181c451d8286d6ed
 AUX gcc-11.3.0-plugin-objdump.patch 762 BLAKE2B c98cec68476fd3c5922c8b84a5f971e86d20f8e47da2923e929b7852da62ffaa45d0ed78c7326e9b4319696d11478f2aac1fabd7ddb6688d85f9b6e686a37120 SHA512 a012c01f54a6db490ae06cde80696fbdc750e937e54f2848d43c920ecdd3365f57197ff08b818d6d2d8423bfe5b31b440642a99fc34506d99588ab6703c95286
 AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f2e40b746a6a6b31c52b95ab4b20292aad1931a1f64ffabd2bef611af85b643718e5a4a280d1e3b54e0a9f73b086d0dc39e SHA512 35647183fdf82bc179d94504d22a5e00a955121e888b5419a0033b7723a7e385c196096c64bf9ed59ad2c72188cb4792049ce423b226bfeb40ed379c355b91b8
 AUX mingw64-runtime-10.0.0-msvcr-extra-race.patch 1987 BLAKE2B 120aa8ad9ee269ee39b3724b3ff26ecfe0865508f655919e0ac69733ed5a41454725d8756c41094ec431f2a1df947db9542ead5d81088db4085d7169e6fcfb6d SHA512 02b696643276cbcd8c129e8a03cc8843f86d0c06608260eb391112fa1aeea49f9458c6978600fc344e8293b032e4482efcc19afd3a61747594888abcc0be6e11
@@ -5,7 +6,9 @@ AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a41
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
+DIST gcc-13-20230416.tar.xz 83936936 BLAKE2B c052fff2838a0bdd87f90345a5f7f5c607a6fe360b02ce8cb076f6dd3a62f6aae0c7d3914eee447e9c92c971331ddcbf0c94f2aa120aef89a742162b5e7dbfdd SHA512 222bb6db05b23aeb428262c69319a4964097065a88a5ae6c19b104c31af82c465f139c08f01bb077b0e776685769b77a54b772ebc4e2057e7c3e8954283997cf
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
 EBUILD mingw64-toolchain-10.0.0_p1-r2.ebuild 9715 BLAKE2B 42bb3caaee09901b0d0ab7e90f3f53fefd3d220e4a99305130c504c387661595789acffd6ef65cdfac549f037ebfaf17294bdea287646634dd34cdccf8c9bbee SHA512 79f4bb56176112f4e77b9d7b1c8a309d56ff261fb0805a65be0dea7629163fe7d9a93fb800ea006b4d71751cb6bddff929de5491e1e84e322874470d943a146d
 EBUILD mingw64-toolchain-10.0.0_p2.ebuild 9885 BLAKE2B 792946139312038816f9beea1d6c522e82f6e2d8ac3f615b88fedf1db2f49138343e8cd2bd22f19cb508e2e4a011a9f297ebdc10e9f92aa74c8e7c107097f037 SHA512 a43ad53d14e46280bfd5228e2618c304997233856dc5599de19dab943efc71f9e2fb76680d346925e303e94329a8fe3a250b21a88ba388eab7fd40d92aac445a
+EBUILD mingw64-toolchain-10.0.0_p3.ebuild 10063 BLAKE2B 50c975eb57497b1516080b0b3f4ce285932ccb4b1eae7feba3cabb78d0789d74dd1c78b210f88629f1ce948b95e86f12762dd63b6790b7f5d3c74fda77e397b8 SHA512 5a876f935abd60d263e1ccc45aac836efcaa7fce52d775e16001f0a0110a522642b7db748fd175f7080a4105f1901adf423efef231cb6a0c9edd3d2fccff4e73
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/files/binutils-2.40-import-lib.patch b/dev-util/mingw64-toolchain/files/binutils-2.40-import-lib.patch
new file mode 100644
index 000000000000..844fdf93020d
--- /dev/null
+++ b/dev-util/mingw64-toolchain/files/binutils-2.40-import-lib.patch
@@ -0,0 +1,30 @@
+Fixes building app-emulation/dxvk:
+
+    FAILED: src/d3d10/d3d10.dll
+    x86_64-w64-mingw32-g++ -m32 -mfpmath=sse  -o src/d3d10/d3d10.dll <snip>
+    ld: internal error: aborting at ldlang.c:527 in compare_section
+    ld: please report this bug
+
+https://sourceware.org/PR30079
+https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b7eab2a9d4f4e92692daf14b09fc95ca11b72e30
+From: Michael Matz <matz@suse.de>
+Date: Thu, 9 Feb 2023 15:29:00 +0100
+Subject: [PATCH] Fix PR30079: abort on mingw
+
+the early-out in wild_sort is not enough, it might still be
+that filenames are equal _and_ the wildcard list doesn't specify
+a sort order either.  Don't call compare_section then.
+
+Tested on all targets.
+--- a/binutils/ld/ldlang.c
++++ b/binutils/ld/ldlang.c
+@@ -649,7 +649,8 @@ wild_sort (lang_wild_statement_type *wild,
+ 	 looking at the sections for this file.  */
+ 
+       /* Find the correct node to append this section.  */
+-      if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
++      if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none
++	  && compare_section (sec->spec.sorted, section, (*tree)->section) < 0)
+ 	tree = &((*tree)->left);
+       else
+ 	tree = &((*tree)->right);
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p3.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p3.ebuild
new file mode 100644
index 000000000000..53a29447919b
--- /dev/null
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p3.ebuild
@@ -0,0 +1,323 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit edo flag-o-matic multilib-build toolchain-funcs
+
+# Pick versions known to work for wine+dxvk, and avoid too frequent updates
+# to due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
+# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
+BINUTILS_PV=2.40
+GCC_PV=13-20230416
+MINGW_PV=$(ver_cut 1-3)
+
+DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
+HOMEPAGE="
+	https://www.mingw-w64.org/
+	https://gcc.gnu.org/
+	https://sourceware.org/binutils/"
+SRC_URI="
+	mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
+	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz"
+if [[ ${GCC_PV} == *-* ]]; then
+	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
+else
+	SRC_URI+="
+		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz"
+fi
+S="${WORKDIR}"
+
+# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
+LICENSE="
+	GPL-3+
+	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
+	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain"
+SLOT="0"
+# unkeyworded for testing new binutils+gcc, will likely keyword _p4 with
+# non-snapshot gcc-13.0.1 if no known issues
+#KEYWORDS="-* ~amd64 ~x86"
+IUSE="+abi_x86_32 custom-cflags debug"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/mpc:=
+	dev-libs/mpfr:=
+	sys-libs/zlib:=
+	virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	strerror_r # libstdc++ test using -Wimplicit+error
+)
+
+PATCHES=(
+	"${FILESDIR}"/mingw64-runtime-10.0.0-msvcr-extra-race.patch
+	"${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch
+	"${FILESDIR}"/binutils-2.40-import-lib.patch
+	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	tc-is-cross-compiler &&
+		die "cross-compilation of the toolchain itself is unsupported"
+}
+
+src_prepare() {
+	# rename directories to simplify both patching and the ebuild
+	mv binutils{-${BINUTILS_PV},} || die
+	mv gcc{-${GCC_PV},} || die
+	mv mingw-w64-v${MINGW_PV} mingw64 || die
+
+	default
+}
+
+src_compile() {
+	# not great but do everything in src_compile given bootstrapping
+	# process needs to be done in steps of configure+compile+install
+	# (done modular to have most package-specific things in one place)
+
+	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
+
+	MWT_D=${T}/root # moved to ${D} in src_install
+	local mwtdir=/usr/lib/${PN}
+	local prefix=${EPREFIX}${mwtdir}
+	local sysroot=${MWT_D}${prefix}
+	local -x PATH=${sysroot}/bin:${PATH}
+
+	filter-lto # requires setting up, and may be messy with mingw static libs
+	use custom-cflags || strip-flags # fancy flags are not realistic here
+
+	local multilib=false
+	use abi_x86_32 && use abi_x86_64 && multilib=true
+
+	# global configure flags
+	local conf=(
+		--build=${CBUILD:-${CHOST}}
+		--target=${CTARGET}
+		--{doc,info,man}dir=/.skip # let individual packages handle docs
+	)
+
+	# binutils
+	local conf_binutils=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-cet
+		--disable-default-execstack
+		--disable-nls
+		--disable-shared
+		--with-system-zlib
+		--without-debuginfod
+		--without-msgpack
+		--without-zstd
+	)
+	mwt-binutils() {
+		# symlink gcc's lto plugin for AR (bug #854516)
+		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
+			"${sysroot}"/lib/bfd-plugins || die
+	}
+
+	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
+	local conf_gcc=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-bootstrap
+		--disable-cet
+		--disable-gcov #843989
+		--disable-gomp
+		--disable-libquadmath
+		--disable-libsanitizer
+		--disable-libssp
+		--disable-libvtv
+		--disable-shared
+		--disable-werror
+		--with-gcc-major-version-only
+		--with-system-zlib
+		--without-isl
+		--without-zstd
+	)
+	${multilib} || conf_gcc+=( --disable-multilib )
+
+	local conf_gcc_stage1=(
+		--enable-languages=c
+		--disable-libatomic
+		--with-sysroot="${sysroot}"
+	)
+	local -n conf_gcc_stage2=conf_gcc_stage1
+
+	local conf_gcc_stage3=(
+		--enable-languages=c,c++
+		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
+		--with-sysroot="${prefix}"
+		--with-build-sysroot="${sysroot}"
+	)
+
+	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
+	local conf_mingw64=(
+		--prefix="${prefix}"/${CTARGET}
+		--host=${CTARGET}
+		--with-sysroot=no
+		--without-{crt,headers}
+
+		# mingw .dll aren't used by wine and packages wouldn't find them
+		# at runtime, use crossdev if need dll and proper search paths
+		--disable-shared
+	)
+
+	local conf_mingw64_headers=(
+		--enable-idl
+		--with-headers
+	)
+	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
+
+	local conf_mingw64_runtime=( --with-crt )
+	${multilib} ||
+		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
+
+	local conf_mingw64_libraries=( --with-libraries )
+	local conf_mingw64_libraries32=(
+		--libdir="${prefix}"/${CTARGET}/lib32
+		--with-libraries
+		CC="${CTARGET}-gcc -m32"
+		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
+	)
+
+	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
+	local conf_widl=( --prefix="${prefix}" )
+
+	# mwt-build [-x] <path/package-name> [stage-name]
+	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
+	# passes conf, conf_package, and conf_package_stage arrays to configure, and
+	# users can add options through environment with e.g.
+	#	MWT_BINUTILS_CONF="--some-option"
+	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
+	#	MWT_WIDL_CONF="--some-other-option"
+	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
+	mwt-build() {
+		if [[ ${1} == -x ]]; then
+			(
+				# cross-compiling, cleanup and let ./configure handle it
+				unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+				CHOST=${CTARGET}
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-fuse-ld=*'
+				filter-flags '-mfunction-return=thunk*' #878849
+				strip-unsupported-flags
+				mwt-build "${@:2}"
+			)
+			return
+		fi
+
+		local id=${1##*/}
+		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
+
+		# econf is not allowed in src_compile and its defaults are
+		# mostly unused here, so use configure directly
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
+
+		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
+
+		mkdir -p "${build_dir}" || die
+		pushd "${build_dir}" >/dev/null || die
+
+		edo "${conf[@]}"
+		emake
+		emake DESTDIR="${MWT_D}" install
+
+		declare -f mwt-${id} >/dev/null && edo mwt-${id}
+		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
+
+		popd >/dev/null || die
+	}
+
+	# workaround race condition with out-of-source crt build (bug #879537)
+	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
+
+	# build with same ordering that crossdev would do + stage3 for pthreads
+	mwt-build binutils
+	mwt-build mingw64 headers
+	mwt-build gcc stage1
+	mwt-build -x mingw64 runtime
+	mwt-build gcc stage2
+	${multilib} && mwt-build -x mingw64 libraries32
+	mwt-build -x mingw64 libraries
+	mwt-build gcc stage3
+	mwt-build mingw64/mingw-w64-tools/widl
+	# note: /could/ system-bootstrap if already installed, but gcc and
+	# libraries will use the system's older mingw64 headers/static-libs
+	# and make this potentially fragile without more workarounds/stages
+
+	if ${multilib}; then
+		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
+		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
+		# just without 64bit support and would rather not build the toolchain
+		# twice. Dirty but wrap to allow simple interoperability with crossdev.
+		mwt-i686_wrapper() {
+			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
+				> ${bin32} || die
+			chmod +x ${bin32} || die
+		}
+		pushd "${sysroot}"/bin >/dev/null || die
+		local bin bin32
+		for bin in ${CTARGET}-*; do
+			bin32=${bin/x86_64-w64/i686-w64}
+			case ${bin#${CTARGET}-} in
+				as) mwt-i686_wrapper --32;;
+				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
+				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
+				windres) mwt-i686_wrapper --target=pe-i386;;
+				*) ln -s ${bin} ${bin32} || die;;
+			esac
+		done
+		popd >/dev/null || die
+	fi
+
+	# portage doesn't know the right strip executable to use for CTARGET
+	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
+	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
+
+	# ... and instead do it here given this saves ~60MB
+	if use !debug; then
+		einfo "Stripping ${CTARGET} static libraries ..."
+		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
+			-exec ${CTARGET}-strip --strip-unneeded {} + || die
+	fi
+}
+
+src_install() {
+	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that this package is primarily intended for Wine and related"
+		elog "packages to depend on without needing a manual crossdev setup."
+		elog
+		elog "Settings are oriented only for what these need and simplicity."
+		elog "Use sys-devel/crossdev if need full toolchain/customization:"
+		elog "    https://wiki.gentoo.org/wiki/Mingw"
+		elog "    https://wiki.gentoo.org/wiki/Crossdev"
+	fi
+
+	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
+	if has_version ${cross_gcc}; then
+		# encourage cleanup given users may not realize if switch by default
+		ewarn "${cross_gcc} is installed, note that ${PN}"
+		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
+		ewarn "packages and optionally only one needs to be kept."
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index d4c01b03ea4e..c455174ebc07 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,5 +1,4 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-AUX pkgcheck-0.10.21-fix-scm.patch 1470 BLAKE2B 2ca07fd6f5736df1bc8ce374842bc5d8090e7e705bf0c98630ab94e9c12ca2f0cd0be6b9bd57d59e67f2b25f971865ff3583d66f2815762e68943083636656f7 SHA512 360091ce895ded5abec23cfe7b9d268d22ae59a237c2f9f85e5463488d94dd8fa86eb8e7b148d0d92066d69854d263dd08645620bc43aedabdd8a283adbbd8d2
 DIST pkgcheck-0.10.23.tar.gz 568903 BLAKE2B 8b00dc93d0c3f597f7397d2e7b3686d11b12da715d6e8071f1b02a8085061cbb2d7cb24bde6a73ef6e5d1459637cb78e536ce80a162f188a42739a434c62c397 SHA512 3bcdb91bf73cde60fd9fc2f5e470c5ccdfd7b3564e83192201b0fa1dc38265e1e0c7f7052039accbb62c55d816a6e89317d7d388c0cc3da3b4836475cb82bd03
 EBUILD pkgcheck-0.10.23.ebuild 2161 BLAKE2B 205f7a20d466ec9d3300d373e9aefea4420489b251b077543375fcf40636820fe2d258f8c10421434f167f4654e1da69d4b21c36b493236c241ff10929c2462e SHA512 3ac329f184a5708c80e3d1096c964054126f5d1f367598d881c526861160f0dab970ef9c2ee49db43fbbfd1f0af13a9c1edcca5d72a5ca7ff566ced3e82825ea
 EBUILD pkgcheck-9999.ebuild 2169 BLAKE2B e94f98e25963292d6581d4e167816da3b62ecc26c93bb7810365b3c1d6978ed803a4c8176065035202c2184e8b54abfdf0b443e18d0e7d619a3762086a0a96f8 SHA512 57aeb9a89927976fd235f0ff5f6fc625dba260ef81a937f85a9e72380e30f091287ad32d4781b9971222640f17855b99f4fb17018e59f74ea1dac2f877997023
diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
deleted file mode 100644
index 387da2374107..000000000000
--- a/dev-util/pkgcheck/files/pkgcheck-0.10.21-fix-scm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/pkgcheck/checks/python.py b/src/pkgcheck/checks/python.py
-index 291a56b4..19b87ef5 100644
---- a/src/pkgcheck/checks/python.py
-+++ b/src/pkgcheck/checks/python.py
-@@ -234,16 +234,16 @@ class PythonAnyMismatchedDepHasVersionCheck(results.VersionResult, results.Warni
- 
- 
- class PythonMissingSCMDependency(results.VersionResult, results.Warning):
--    """Package is missing BDEPEND on setuptools_scm or alike.
-+    """Package is missing BDEPEND on setuptools-scm or alike.
- 
-     Packages which define ``SETUPTOOLS_SCM_PRETEND_VERSION`` should BDEPEND
--    on ``dev-python/setuptools_scm`` or a similar package [#]_.
-+    on ``dev-python/setuptools-scm`` or a similar package [#]_.
- 
-     .. [#] https://projects.gentoo.org/python/guide/distutils.html#setuptools-scm-flit-scm-hatch-vcs-and-snapshots
-     """
- 
-     desc = (
--        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools_scm or alike"
-+        "defines SETUPTOOLS_SCM_PRETEND_VERSION but is missing BDEPEND on setuptools-scm or alike"
-     )
- 
- 
-@@ -291,8 +291,10 @@ class PythonCheck(Check):
- 
-     setuptools_scm = frozenset(
-         {
--            "dev-python/setuptools_scm",
--            "dev-python/flit_scm",
-+            "dev-python/setuptools-scm",
-+            "dev-python/setuptools_scm",  # legacy old name
-+            "dev-python/flit-scm",
-+            "dev-python/flit_scm",  # legacy old name
-             "dev-python/hatch-vcs",
-         }
-     )
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index fa3208aca710..89dbbc22a552 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -2,6 +2,6 @@ DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B
 DIST pwndbg-20221219.tar.gz 8344938 BLAKE2B 1ecda02573ef03b569f8a46c390f5388e6db9cfbb0df84410f245e4f043e89be16b6581d0e07fe840d50cab875943dd5a30dab1c2fc40fb93c5982cecc33e490 SHA512 1578ea834d7aa1d574e559844dae1991eddc9575c4e445ae02d05f0024900c550253293cba7277ed651df613cb2a2e2028486c2b8bc52adc0dedb9d9796c58d8
 DIST pwndbg-20230319.tar.gz 8363103 BLAKE2B 9ad84450116b4e8e3e82107fea6d33505c61e81cde52a209865d4fea1620dd8db2e7f395e2764f9ed38e10311ea9bb77e08fb4c087bd3307ad06d3ea3489ec42 SHA512 aa84908f1dee97e04b72d4f789d78c861507a3a842ecfe00a0ab8a073d63652b8319094a28d910c916131dec3d8fd1eced00c9dc4b97220e1dd76da89baaf695
 EBUILD pwndbg-20221219-r2.ebuild 2385 BLAKE2B df46ffb335343d9eee63a4d13fbd875a90df029ca2972db09d54a243e61de8ce9325d7538f42387df23f2aea70fac2edf30a7e4bb1e8238f3b173f7a66659a46 SHA512 37be4d88673f5e29f6c1afaf4761f587a22421d282e32082508a9ea916fb19fbcf6b75b6c7b3e78b6ca1b2886e18cb11f4cbbd7ae85af3d1b95b7ea8cc7a0282
-EBUILD pwndbg-20230319.ebuild 2493 BLAKE2B 603ba4fe11c0fcc31fb6dc2abd79dc752e6d031018ef889d691384666c18ac6ce599c483a0ce2af9cea774f81c64e8cdc1b47c970a80701212c1b8d0c431876c SHA512 52ff6a91eb267187a043d59ae72d8b0eca7614f6253c109e2a18617bfce776d123efbf9b533b22eee9e364a3cdf5468ea30fb6db6fa1c22e6abe8322834fa38e
+EBUILD pwndbg-20230319.ebuild 2491 BLAKE2B 2b6e1325cb0a52e49866491e43176656beb5f0fc9611aa0b589a1d39e1c64f2c5e4adc5efa8837625ba5de50b46729504e7005242f73b35e1c3f7c295e525774 SHA512 c1076e399b19127916652678164b9eec5d71c223084da78be837417e4f94e894004302c63922be247c8b382c99a0d0769eb528b32bd8fd5ffce5a06fe61982de
 EBUILD pwndbg-99999999.ebuild 2493 BLAKE2B 603ba4fe11c0fcc31fb6dc2abd79dc752e6d031018ef889d691384666c18ac6ce599c483a0ce2af9cea774f81c64e8cdc1b47c970a80701212c1b8d0c431876c SHA512 52ff6a91eb267187a043d59ae72d8b0eca7614f6253c109e2a18617bfce776d123efbf9b533b22eee9e364a3cdf5468ea30fb6db6fa1c22e6abe8322834fa38e
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20230319.ebuild b/dev-util/pwndbg/pwndbg-20230319.ebuild
index bd3b1a48231a..71fa373400c1 100644
--- a/dev-util/pwndbg/pwndbg-20230319.ebuild
+++ b/dev-util/pwndbg/pwndbg-20230319.ebuild
@@ -20,7 +20,7 @@ else
 		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index cd3c054e8382..54ecc8faa544 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,3 +1,3 @@
 DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f6a1a17090eb55bbcaf0e8e5f4c2ad6a68a0415acb76c093c99b7bb223aeccd68392877bae97eac354578002 SHA512 d2dbe94dbd63fbd11ef0fc8c08eecbd7000df23388afe21d30151854ff4ef2b3a6c780c60ee52408832a146570a1f7b3f0269fc0c831953e871d2dda1ed8cb3f
-EBUILD rbtools-4.0-r1.ebuild 1715 BLAKE2B 3cb8081fbae7b8421fc5c1c00dbb08c7029169c64eaee88bf4581af157b9e431eb5a0eda7d90a77de3e898c31e91b8d535b828b8d5f911c0aaecfa33b6686c8b SHA512 b940977c7542edcad90541ba339e29a5f72fa38c9ff633f95e2b9ff930dcc7b0aa2646bc7d7f9e7d619e10ade48bad1c693f9a7af9a6c203ff655e173a9000c0
+EBUILD rbtools-4.0-r1.ebuild 1715 BLAKE2B 31f3a5376014e1df4143fe0c3ae5887b89073054da9e134dc1902a07ee1331a08e425d8d3f7f670bd60e36a1b26c88b1dc877838d63d1c41a19e4658c2c7aebc SHA512 b99ca8901d245827da1535dfe8b45541a109d4a24b272969984cb275abf804790eaa1e80e07cd39a501e0caaa27cd467da11448da9acacf898fc616a2561592a
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-4.0-r1.ebuild b/dev-util/rbtools/rbtools-4.0-r1.ebuild
index 90d74a5b8e53..928f6fd60c97 100644
--- a/dev-util/rbtools/rbtools-4.0-r1.ebuild
+++ b/dev-util/rbtools/rbtools-4.0-r1.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/importlib_metadata-4.12[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.12[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	>=dev-python/pydiffx-1.1[${PYTHON_USEDEP}]
 	=dev-python/pydiffx-1.1*[${PYTHON_USEDEP}]
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 42d508dfd486..e6cc8a520487 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -6,6 +6,6 @@ DIST rizin-testbins-0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz 179281553 BL
 DIST rizin-testbins-aef7f7b714a696f382f55b8cbbf94c5b69518de3.tar.gz 178497762 BLAKE2B 8c82a537a58e65d35bd8b309311c4377b5996ff4b650fc6cff4cf347e04fbe4b2ec0e88f03ff43572c8e99675186b05b393b7da070a60ab107c3cca829d2544b SHA512 2745b58646963c28a45b46e8e709845c355863e61cf796aeb3d2e617f1bf2f9916a4b106cd08f48b1ef6e36f7f38624b5977dcd62c921124b0a1122b7220baa8
 DIST rizin-testbins-d66f95359fe830514267f446975374752201c3f1.tar.gz 179428523 BLAKE2B 9d18c2f49460e26809bc526eab9d7bfed15d3fb3f94b22d327f9981547130f82107259f2942e098834cd8ad755e8eadb4b8459a10070105ec116b16fbac19fe3 SHA512 cdeefc6e4103e99c4581a45475c2326505f8003c80a158a78be32b27dfa65fe42a80bbf25ffc47c1f8abdd50faba0fb073a7236395ab67eafb0202695877c4ba
 EBUILD rizin-0.4.1.ebuild 2441 BLAKE2B 6b93beab0b3f394b243039551c66a27cf498a7943cab90063d12d31e2349d478cbce12795ed724fd51393c1ce4e944f550e73279a52bcba7a3528370371b9d20 SHA512 ead851e780e6d3c0ce5e8c16789e182b62dab1631fabcebd96f17b0e0c449ae48b5c3caac1c0d1bfb7e7d2dadcaf0a6b16757b26991fe5f7647d7dd349bcb85b
-EBUILD rizin-0.5.1.ebuild 2257 BLAKE2B 89f5228616e446b6bc3025df6fefec518418eae68364b9194f4b9132048f185505ee7ea378d0e120544fd07506a017eb73f028331780bd2d0742a9f9340edd77 SHA512 a47a95b794adb555ab901b044ea78f2b27819a4b8618b457d26f6017435caaad3b68b6b5f621b770e9ed7a9d02307d7d0ae969663c7215949d310d16cb778250
+EBUILD rizin-0.5.1.ebuild 2256 BLAKE2B 4a21a2ce71e77de80320b9175306d23e432223626f8ac8a47aa059fa64bbe59b430a2bb7d9c3c706e018f141080cf4d98feeb36f64b20259bf04005f7ec49f62 SHA512 e3d9e81d3154f13d5c5b605d874d36f55190b694f77d546179672a24ff1bd83f7d89ce92c0cc196f4ca54912ff2e5853697fe1e1a30aa217637b37930c430b3f
 EBUILD rizin-0.5.2.ebuild 2384 BLAKE2B 6321bfe5c87ba179dfc47fafe02e3b0c41db44b2c2805f53336750671c4a60fc993b8d81d33b8a339af02dd0f8d1bdb693706eaa64667233040784059cadb7c0 SHA512 31f9930762d341322e8e0481534870028a8f80d07c24ebe75fff13715b08a72b7fca9efbf8a7e3ce193216261dd56867172656143dbb8d2b986d2808f0fd74fa
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/rizin-0.5.1.ebuild b/dev-util/rizin/rizin-0.5.1.ebuild
index 122296d19b05..b236c67f527b 100644
--- a/dev-util/rizin/rizin-0.5.1.ebuild
+++ b/dev-util/rizin/rizin-0.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rizin.re/"
 
 SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
 	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 7b4a4e80da42..bae5577a1dfb 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,4 +1,4 @@
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.2-r1.ebuild 601 BLAKE2B 4bcd02119312d9ace79730623e189c7d06fd58624791a4c2f344cb74f01533c290b4bce693019e8cb94d69b7cf103aabcab8e4a432495a04fa67eb7e982db269 SHA512 1970cfffd08e0618615596f0bcf25cbc6c0e487e0263d4928713e268463187c4cd26500135a65bdd2fdcbf8bd748c8e314ab8f59d174061fe4e99093b683be33
+EBUILD ydiff-1.2-r1.ebuild 599 BLAKE2B 8e7f6558fdd0db8fb96d2f2caff5d41b142dfd107110cb046e546d8a02d55e5e87c8e371b45f47ba7b0e4f46d2a72b556ea0317bfc12f97b6292b6b7843c4b16 SHA512 07f49ded5e0f84ad69e92ada1e7a86a1585c090dc78fdeb7b47c07abd74b77e80e5fb05b1e83136ec656214039e853fea8932a8383b09cd6860d3ee6c26e17e5
 EBUILD ydiff-1.2.ebuild 642 BLAKE2B 461635fc87413caff56750c87bfb828d036249013690ed8d584cc5c4555055196d5c7044c856894792f573e524bd35b64190f5543063f0d37d3e720ba56ab34c SHA512 eea9f0471582ed3020195d4079ce9c090f61a6a5b13ffb62f094453a058b131a924a152deba4b941995a21cbdaf7a75f15ae1205f1751583a4d26707ea87354f
 MISC metadata.xml 394 BLAKE2B 7333c46ff0d147ca8dc7eafd8e5f3eae67c7217467d45431585898948671df5e836995e89414fb95a9645f69c4f1d2020168a87b952115ce3b6225d89b46aa01 SHA512 781694fc99405f67446875b9fb40a306cd5223f1f27d1fff5f0bd2fe35aee1d6a518486999d06732e89fdc5759afdf0235615170718fea80ba0d69fc95f97fe7
diff --git a/dev-util/ydiff/ydiff-1.2-r1.ebuild b/dev-util/ydiff/ydiff-1.2-r1.ebuild
index 6b0c9d651200..0e52ba3f8d8a 100644
--- a/dev-util/ydiff/ydiff-1.2-r1.ebuild
+++ b/dev-util/ydiff/ydiff-1.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ymattw/ydiff"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/less"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 264e9fb57423..9f3c744e35a3 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 322a776a3184..7bc8d6dc1e59 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -3,6 +3,6 @@ DIST git-cola-4.0.1.tar.gz 1018819 BLAKE2B 523264bbee38526d12db5ad975d78c72ef6c0
 DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0
 DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891
 EBUILD git-cola-4.0.1.ebuild 1715 BLAKE2B 955821e26cb59cf6188372ef1ae48c09a1a6202f4d250182f31572e60f8d41d09933ee4a453aad771a4ff5cd6d467ea55301101f868aee8539284ee60bf20a14 SHA512 67e3a0b58632d4ba326b5218cef3083ad2ad5c9894edcce87b1f55ed4026d7aa0b795ca90afedc914ce1b6788871af725b11f57042ed8f2e2dbca2ec7e19eea5
-EBUILD git-cola-4.1.0.ebuild 1600 BLAKE2B 116008d3d9bf6306dd0211c0b8421feae6e5e6dfb96324a989dfdae435d4c319ced4063803de876fd4beb06a0b9033c1ead3401f9d4e798f1b0b593968a52f74 SHA512 4d534fcc7c67a0d7a711d38c2d5253d057448ec41faf69441a92b9a50742b304d7315846481260a9ca2201db33266d295edc766403df27d740a103438656ec55
+EBUILD git-cola-4.1.0.ebuild 1598 BLAKE2B d5fa4c9c9eb78e5f7eacd8cc8f16660114fe1b12a0fb45a33a59755b9585460b626f2906ab893c586ea7190f73f3469acc60cb741d8252cf6e85069cefc09793 SHA512 9a49926ced65ec3837de5b184e8e51dba0cb9bd870767febe0f1864ab4d9e3f5bad46eaaa5cd32edcce17a31752cbbf9232193dae04f168677b2403a8ce78c01
 EBUILD git-cola-4.2.1.ebuild 1556 BLAKE2B f937a9d1deae17654aa82a11653add8661ba931fc5975b7aca2247cd98d91b5e8f4d581f4697f9330bbfb1a532546a8ccd6afef5e56715acdcf76fcc7c5a8b22 SHA512 06c3a8a3dbf09f5ad35ba4027356a0c0c87da0ea7b975cefa4c4e367599b841ffea60334ff50b7f8205aa4993e1401ea6f5a37fb172a1c5aafe96e6a60fefd8f
 MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379
diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
index 1238acfabdb8..b4db3a7d1dfa 100644
--- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild
+++ b/dev-vcs/git-cola/git-cola-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/git-machete/Manifest b/dev-vcs/git-machete/Manifest
index 12ab1c395336..a277d8812cb0 100644
--- a/dev-vcs/git-machete/Manifest
+++ b/dev-vcs/git-machete/Manifest
@@ -1,7 +1,9 @@
 DIST git-machete-3.14.3.gh.tar.gz 1397234 BLAKE2B 827d3234260461d5cba6b192767e9923b79cc70afb0e7d0bd24e3f307559e3c0774499b34651dd6da7e52157c18becb69c15de9246b99bb35d47104787e6164e SHA512 a4e6015832b4fefa48b75dbd2f3aa50f53788c3a612beada971c0da9da722d49b48e891ddfa3f7d6c91ed4d461b16504ecab9f64b4da84d319b08bb06b1ee8c2
 DIST git-machete-3.16.1.gh.tar.gz 1402344 BLAKE2B 4a2c8e473b1e92669e8db7e09850dc8361a110e0f4066fa76fcc6b27fb5c78b034a83f3c6543a2358dd90b86963fefee659c6889b426b496bb4665b8bb056346 SHA512 b2c35da8b5785ac78d81e0782daa59e1ca9f0ae8083dcacd9304f57d916280d604ab9f8d50c5a9ebb1a88ae4d195e40ce8c686316b8de8f62a13d3009feca330
 DIST git-machete-3.16.3.gh.tar.gz 1618456 BLAKE2B e8207b11bfea6dd50965aaa300ec7303684503b900912b031f08378c7d80b388b341d23769cea5fe4aef0d78bc8457b0118aa3e05a49b0c1c4a3f9a97019c46e SHA512 fcd856c0fefecd2cf97ba149f1d1df57eb6fab0345c00c3d3df763041cc86226e3f815dda7c0050f8669d7d082e329dd76304de2092c7b43219e0c50a2e3467a
+DIST git-machete-3.17.0.gh.tar.gz 1618705 BLAKE2B 212d13ab639ce2299e91593dd9b0f978d1e2dd6ec6a79a378db0399a4651ed312da63a14a78ee6df8f7d75b5d651922905646803d3f52ac7bcb7a3e0753e8b8c SHA512 ea5a9b71788c24d0e1eb4beb79bd1997473ef549ab12f772aa5b2b11650eebfd9e100742e731d475779b24f6b810da47ec6ad562f562329bf875060389e1ecd7
 EBUILD git-machete-3.14.3.ebuild 1113 BLAKE2B 2a6a42b99966e5f3f1f48ee1154d72aef41bc274cd28dcf2ada2c92d09d6419a237ebbcce34318304e791a4786fd8dea6b07e7cdbb05734bba266f3cd38e4b92 SHA512 4b12e321b6f6960ded2d7a31eb0827fa66274270e0af1e42b659aa580b3ea6f2bd56ee342cd155ae96029b69c47a7a05da2c9cc6f2cae144294ea4442e31d70d
 EBUILD git-machete-3.16.1.ebuild 1114 BLAKE2B f1fb6a4f5c878203bd446a259386fc78458f394eb5cf6e692841cf49ca9be9eac59e33fd73b3f0ca541d8d064a136d49a428b519f704d6b34843f0362cbc5ced SHA512 07b107304dee3bb17b6b516127a15bbee808216b65990ee15634b12f08c4efcae451a9a78e777be0b0e6f149afd5b6bc884c51a6a3df6244fc92daa54fa7e320
 EBUILD git-machete-3.16.3.ebuild 1114 BLAKE2B f1fb6a4f5c878203bd446a259386fc78458f394eb5cf6e692841cf49ca9be9eac59e33fd73b3f0ca541d8d064a136d49a428b519f704d6b34843f0362cbc5ced SHA512 07b107304dee3bb17b6b516127a15bbee808216b65990ee15634b12f08c4efcae451a9a78e777be0b0e6f149afd5b6bc884c51a6a3df6244fc92daa54fa7e320
+EBUILD git-machete-3.17.0.ebuild 1115 BLAKE2B f8847098953db2ab68ac64283d09e34f377144e6d1c55f8b54676261c2c652539604e7d80f4ee4b0fe5617ddd8880c2eecc1729921f3eac40bf9cdbb921ea67e SHA512 e90e99eb6942a49f375f05ed7f02722d4abf5009d7fec4dcb4f33053fa80d7c89c6e9dc9394008413ecc38e417e4df3aa14498e80baaef0bb2ae346bc3cfc654
 MISC metadata.xml 835 BLAKE2B f59f4070f862a09fb74c57b5ef093e4c8d1394887f71b8f490e49e49f64722b48ab44f15907edb0eff322227f5a97aaf5d2d92512c818b8aa1020e6f735971c8 SHA512 d31266b47abfef805f0f0ae5f13c1f89ec13907fc7e33e126eefee5600087ffadf8f55e48c5c42c295dc7de8d901a3231db0756a79d666651569a150d7016cea
diff --git a/dev-vcs/git-machete/git-machete-3.17.0.ebuild b/dev-vcs/git-machete/git-machete-3.17.0.ebuild
new file mode 100644
index 000000000000..c04f32d1e272
--- /dev/null
+++ b/dev-vcs/git-machete/git-machete-3.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Probably the sharpest git repo organizer & rebase/merge workflow automation tool"
+HOMEPAGE="https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/"
+# No tests in PyPI tarballs
+SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="dev-vcs/git"
+BDEPEND="test? (
+	>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
+)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp completion/${PN}.completion.bash ${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completion/${PN}.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/${PN}.completion.zsh _${PN}
+}
diff --git a/dev-vcs/gitstats/Manifest b/dev-vcs/gitstats/Manifest
index 273206d509ea..ebbb60fd343e 100644
--- a/dev-vcs/gitstats/Manifest
+++ b/dev-vcs/gitstats/Manifest
@@ -1,3 +1,3 @@
 DIST gitstats-0_pre20201124.tar.gz 37097 BLAKE2B 8ed3f7a157d3a1edbf6f880c491e8b4fec351a0dc3b7212e5bb0eb3e509ae4002fe407267da17bea775d154e38d8ca43eec00e504b614fd8a7d42b6151de43f2 SHA512 98c0a5a67d5daebf951f2e0568182ab65e1077026facc1eef38a35df8411b1356258034fea009c5a15b7e77d17240e02c5a565f0f39d497a45846d5a8cb570ae
-EBUILD gitstats-0_pre20201124.ebuild 1013 BLAKE2B a68036a1a0adc960dda003d86b8b20f469362bbd60327c5ab2df7bc222b88f1a71453dcbb0d2d78a0ce4a5850dc30e90a60e8ac24095bf398618eb5597ff5b49 SHA512 d23609f17a026257b4661fcb37ae6f33394e3cec361a02edcf33fc51274973966e5121f8d3cc76bff29d204d7eff5fa675ebb29304782fa9c8201a715aa49744
+EBUILD gitstats-0_pre20201124.ebuild 1013 BLAKE2B 0ec9c285638f1f502dc211c2aa24987c2f0f681b49bdbd23300964f27d77c98e670efe9223bbf00915b38a914e60c76fcf6df2ba7b8d66a325a387a88d33393b SHA512 18c4cf6dcaea2292b25d0bc0dd2c1d8ccc45ab266fe70f579f540c00bd6a9d9a218845b55dc24d48454bd3a48336b2a721f1dca933bb011b801ca358753a6f83
 MISC metadata.xml 440 BLAKE2B 520392ad03ea173e2f01774ad3d706ae27036ef8564b1e18ab70d11f735b83797d631003fa8ec19123cf1e4f9452663b2262f112b0063ebccce485244d0df34c SHA512 442983496e87440cdeabd9f1fc0a4de96f2851485e5ed5ea35373734eff6969bc5d26746062e1d078295d1224c4a0b5727838bebb1c155c689eb340af109cd06
diff --git a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
index bc188f529ee7..9dfd0467a905 100644
--- a/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
+++ b/dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d7913b5b846b..86f1fe8a85e3 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
index a24cc0e73dcc..52b5bbb0c59d 100644
--- a/eclass/llvm.org.eclass
+++ b/eclass/llvm.org.eclass
@@ -63,7 +63,7 @@ _LLVM_MASTER_MAJOR=17
 # @INTERNAL
 # @DESCRIPTION:
 # The newest release of LLVM for which manpages were generated.
-_LLVM_NEWEST_MANPAGE_RELEASE=16.0.1
+_LLVM_NEWEST_MANPAGE_RELEASE=16.0.2
 
 # @ECLASS_VARIABLE: _LLVM_SOURCE_TYPE
 # @INTERNAL
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 62a96a45e287..329f5da5c0a2 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 5f4db796f143..723d5d59d012 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -1,5 +1,6 @@
 AUX commandergenius-2.3.1-build.patch 451 BLAKE2B 5c82e9919262fd55ec89069c55de2ba0f18eea2af4587776c353345aef7fb1657763abfcf0956856dae3707a65f0e33210dc521f95d3a0c863461bdb851667d6 SHA512 7b567072137af294b876da4d3701deddc5bf80c52c7a9bf7f0e266885f2a5cc61b7f495725e9d3fdaf3527cf92da0437c8ed1b90f34f9925579c2fe5da8484fb
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
+AUX commandergenius-2.4.0-gcc13.patch 755 BLAKE2B fa234216b53ece9db710d31fb1d616ef462c68051a07cb376a354089b0f4e106832d23b38e439fd089b20097cfc34fb0084b65293973f3a3f0ad7d93794cd869 SHA512 7bec5e8a7619add0a92b237f1cc4cf24b802a5b0185fae13a8fe543d0b7a36009d1fecbeb66122183f7ce6c393836b94e1748c912a994e34fd09444bb06ea4b2
 DIST Commander-Genius-v2.4.0.tar.bz2 62351265 BLAKE2B 0a3338bee2e494f415ce5072978f050766fff16e5df5e7b27824fb4d4c699d2e5a690924f339189325383bee273cbfa5424f43aa9dc87ae4abf63c7cbf1ea6cd SHA512 76eda96fade00d164d3ea5b95acadfb28a3b24864a5ce3f2c9317837a1027cd8d0282a474b8d25bacc26008a26a6adc5062ee655f9abd350d44db58aa70d3b3b
-EBUILD commandergenius-2.4.0-r1.ebuild 2378 BLAKE2B 1a4bb6122624bdc89dfa998e4eef39019e8353c43ce5a40a21ff59e519589e4303a868f0fdacad1a7bff691601f0f79dd7ee10a696ecdad77a0f3f803e9951a5 SHA512 90b28652aff3d660f80d07643a2e22dd15af645354a81a82e15d621915b6a37d17d9d06483824d5c6cf685064c4728a57b177cda6c4a8f58558f638168c367b1
+EBUILD commandergenius-2.4.0-r1.ebuild 2410 BLAKE2B 021cc9446bcb90c2a9f47664ab661b92e0119dfb27e927b44283c4e018861cd7842e751e61a3ba1a3fed891d8ab280bca65d599c0a35745b818a5813c2d88bc6 SHA512 60b42eaa51f34b835f05d68beb848cf90c7cf957cc1c99b041672a8a2f76590c08c8484360c895514e566194d038af7efaae18ca71165b9e10ae4d0f970d81d3
 MISC metadata.xml 507 BLAKE2B bd158aecbbb8bf56cccd4564dc6a0d2e615e6d54bce9c0a4d826c42905056199256f7b03ff2c720a6c3c1543d983375dfa18769e299415461fa0262160735b8f SHA512 e4ec4b7b99da2d83d42450f552973a899d3f637d802658b2b90b0225f4087ee05acea913567a86777c7e96379af5d6282c935a9ec754d5ef57626feb1aab6836
diff --git a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
index f263f3a77456..82eb3b850b7e 100644
--- a/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="python? ( ${PYTHON_DEPS} )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.1-build.patch
 	"${FILESDIR}"/${PN}-2.3.1-paths.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 pkg_setup() {
diff --git a/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
new file mode 100644
index 000000000000..866905c251b8
--- /dev/null
+++ b/games-arcade/commandergenius/files/commandergenius-2.4.0-gcc13.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/Dringgstein/Commander-Genius/-/commit/f9fb2808acfca598fe6e6963c84fe9afe5bcd89e
+
+From f9fb2808acfca598fe6e6963c84fe9afe5bcd89e Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 28 Mar 2023 10:56:06 +0200
+Subject: [PATCH] build: resolve compile error with gcc-13
+
+GsKit/base/utils/Unicode.h:16:9: error: 'uint32_t' does not name a type
+GsKit/base/utils/Unicode.h:17:27: error: 'UnicodeChar' was not declared in this scope
+GsKit/base/utils/Unicode.h:17:38: error: template argument 1 is invalid
+...
+--- a/GsKit/base/utils/Unicode.h
++++ b/GsKit/base/utils/Unicode.h
+@@ -11,6 +11,7 @@
+ #ifndef __UNICODE_H__
+ #define __UNICODE_H__
+ 
++#include <cstdint>
+ #include <string>
+ 
+ typedef uint32_t UnicodeChar;
+-- 
+GitLab
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e3f22bfb3c4f..42e21d1f6a93 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
index 0e6b653d83ed..f309bd12747d 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1,4 +1,5 @@
 AUX openmsx-18.0-add-ctime.patch 362 BLAKE2B 23c1c79f0356391f40a2cb64e0e1c82ee46057e06365ddc223876b488f0a258d291466c55f012de1c97fc9f0f496ee0359f6bd6ec7d30866b07895959410ea6a SHA512 c550de0cb5d39513ba626323ce8cee5cfcaf545e9759ebf845b4249c9477bbf914c4fe5efd1f9031f590db2fa47c67e81da948983add72cb05c991fa63cfa860
+AUX openmsx-18.0-gcc13.patch 626 BLAKE2B 833be69f78396b890c4fdac73e02ea0a9140236e34a00ec2cce7e35463086bd7b2297d0168125c6cae746742f97393c519631f869d1d5fd85e63dc0dbd88e27a SHA512 60b0c6bee5d371388788d6a5116b8e01e361be4b6a698d1ccc0fbccca15a9a443753c9fe4a085ca87ea28b5e553674c27fe2382a727adb19c9373651d8ba9877
 DIST openmsx-18.0.tar.gz 4151084 BLAKE2B 0d5b4e4745c12689e4227408481367b4b4faaa4c7c2830ec0c4b9a5eb90c4b415628cd21834384d39fa4a820c725431848e98f7ef722c437f7bb4f96ae7b14c4 SHA512 f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f
-EBUILD openmsx-18.0-r2.ebuild 2952 BLAKE2B 1a6f815eed0693734e001be4adb14a8c981d6d0819b5e3cfd5b444440ee31751abcbbb55926b8ae56778e73276df5b6e92f0d921e50cd4e1bb72d3a0a435bf35 SHA512 dab7972a6afe8a120737a3a8926c4e888b27e540f0dc10f6edc445b30467208dd0a19179856ba0bec0c7fbf4a3a7ced91dac76c75c60053ee0998c5d3ccf2a25
+EBUILD openmsx-18.0-r2.ebuild 2985 BLAKE2B 42ca9a7f545dd7d07702d3f179124102edfec4dca46d26a0668abd8b9455a500c04b2bc30245cb42b61f242a7c06c6a70af420647bdbcce78ae82f915a148f0f SHA512 17be880189f6c60db1758b998315c56440a9742772ea54b40bb895fbdf9fa102d5b5237454b9fe92189e1b0c8888eccfa3240aa463fcc5928f04b06d6bb1f062
 MISC metadata.xml 442 BLAKE2B 579f3b84332385ce6f79c1f927bb3d4b1b112954695bd30425849946ec3994158a855fc9dbff8407775ad532a105e518ba30b4e72f3e42d3b64e2cadffaa9220 SHA512 a24a4c4cef293439f8ea46ad1261507160ea5024cbc53947915e6306a1356d5682440fa1eb230a98e715214c53024fa7ffe4aa97f1bb3f385c66c1ee69b8323f
diff --git a/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch b/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch
new file mode 100644
index 000000000000..3da34aba3aa0
--- /dev/null
+++ b/games-emulation/openmsx/files/openmsx-18.0-gcc13.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/898908
+https://github.com/openMSX/openMSX/commit/b50d02069c09f11c687637c64ca1b459a5def28c
+
+From b50d02069c09f11c687637c64ca1b459a5def28c Mon Sep 17 00:00:00 2001
+From: m9710797 <vermaelen.wouter@gmail.com>
+Date: Sat, 4 Feb 2023 16:37:39 +0100
+Subject: [PATCH] Added missing #include
+
+Thanks to 'musuruan' for reporting.
+https://github.com/openMSX/openMSX/issues/1487
+--- a/src/utils/hash_set.hh
++++ b/src/utils/hash_set.hh
+@@ -11,6 +11,7 @@
+ #include "unreachable.hh"
+ #include "xrange.hh"
+ #include <cassert>
++#include <cstdint>
+ #include <cstdlib>
+ #include <functional>
+ #include <initializer_list>
diff --git a/games-emulation/openmsx/openmsx-18.0-r2.ebuild b/games-emulation/openmsx/openmsx-18.0-r2.ebuild
index ba32a858f88c..d2c45954266a 100644
--- a/games-emulation/openmsx/openmsx-18.0-r2.ebuild
+++ b/games-emulation/openmsx/openmsx-18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,10 @@ the following directories: /usr/share/${PN}/systemroms
 or ~/.openMSX/share/systemroms
 "
 
-PATCHES=( "${FILESDIR}/${P}-add-ctime.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-add-ctime.patch"
+	"${FILESDIR}/${P}-gcc13.patch"
+)
 
 src_prepare() {
 	default
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 00a58c352ab3..65ddeb12f4d8 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,7 +1,8 @@
+AUX ppsspp-1.14.4-gcc13.patch 1395 BLAKE2B a6bc3e1b3fb4ddf26adc35d2c8815b5ac44ad836d0503356499f198b0c7bd6518dd3e84d7673ff065a2a950a004159de151a289a35d5610d96bb6bb120129329 SHA512 c720bf9441d3aa677507576b77ed839834e24436f8bc369466e45c38a021e15e4ae857c53b14a7ca4d5914fc28f685a74149ab9a02ff9ce41320aef68daa5fd4
 AUX ppsspp-CMakeLists-flags.patch 913 BLAKE2B 7bd5df94b51dad35325586f7ad23284436ba670a8c2218a4a6bfb28fb5a055240aeb0543fe331310a0d86d3661cbdf418689a592139ff832802ba1fabbd10fc3 SHA512 5b2ee899b2fbed7229d4abc027e2a010327be4d334e343f977319c475feaf2d180bd74d3640022d0175b11e8256035c828dd4cf03c8a5b9240c989b2d7f72fb7
 AUX ppsspp-disable-ccache-autodetection.patch 753 BLAKE2B aa580bb2c657830bb079618e83903c4a0e28aa13acd612592f58feae2b0ef98535ea6f7e3c76aa9e74004aa80367aea372aec443bb2b789d5f3e7359872ea34f SHA512 cbf1f6e9f200cfa3b51bb84e09206a85aaea38511c0036a24d5e12547c659019fe88fbf221d2f7ddbdb9f0129f8b0fabb24baa594c658ab5ab584a0a723bc1c4
 DIST ppsspp-1.14.2.tar.xz 46414560 BLAKE2B 3b1cc4a1f7824be4fe0e9abaf52df333965a9b2000bb412b71ea8308a75d4f250ff80c8097856720eb6339926e0b73bb725844f6cabeededc0c2475342a003a9 SHA512 767345235faa54c6a0c19c41fead43f67c39d7f84cd3d573523a745cd082166910090789a985873be047ecaf17513ef318362041f5dcc2b068b1ff061d787f79
 DIST ppsspp-1.14.4.tar.xz 46405556 BLAKE2B 6ba958e8bcefffeeb0d05f3c14cf7381737a02deed27c45d564ba4e556af5654e51ffad5c8a8f880ce85b8916db4ed51b8be13c1ca01f7b6d7b28fa266425605 SHA512 144f5af637f747c745a34d28c95d498cfc736777240ad4eb0a08721af2fcb36106cf93a73d49df0fb572ee7ec78b4bc0965c9f4b3845e9457a4d7c967b8389ec
 EBUILD ppsspp-1.14.2-r2.ebuild 1399 BLAKE2B e23586f8504465887cf3ecb26991f1fe70ea2d3e871178f564b94bae62d746c54c79ee8e38e3eb4b518875ff68f7c51a74d8b6180098957ba9e4748f410bd927 SHA512 ec6834e59326a5def648b999dd488898639b6f379ae205e7ffa6d6a5dd40b0928b52a98781b4ae59057c858be5ca37ee84ef33e49069ae53664ad85d9b2cc074
-EBUILD ppsspp-1.14.4-r2.ebuild 1399 BLAKE2B e23586f8504465887cf3ecb26991f1fe70ea2d3e871178f564b94bae62d746c54c79ee8e38e3eb4b518875ff68f7c51a74d8b6180098957ba9e4748f410bd927 SHA512 ec6834e59326a5def648b999dd488898639b6f379ae205e7ffa6d6a5dd40b0928b52a98781b4ae59057c858be5ca37ee84ef33e49069ae53664ad85d9b2cc074
+EBUILD ppsspp-1.14.4-r2.ebuild 1431 BLAKE2B 59d64f76252a0e92d254d82d96a4bbc415d45cf0adba8302ef0747f4ad012a7fbce32f9983d21350e4828a32189920e3a56df0c8fed2903e4d23e5327a2ace71 SHA512 81cc79a48bdd6ea1c7a46336d0a25ebb0c889114c6e272537a74358621498d873409dc1838fd2c1813642863af0ca7d512ddc263cea63a8a23d27e86ddf05364
 MISC metadata.xml 526 BLAKE2B 19d0378d36d2b1d81ce404a95d98488b54f4368c72a7397b6d7c9a444edec9c19d146295cfc247a75aca1e1b5d1643161a627b80ea76aa8d43189a5eb14380c2 SHA512 7a8c8a7c05acdc110422d7c38552c8106d1886a672e6bda1212ce9cba737ae5e89e6624010d5bc3149b8da7c061b10295a721c74e7377587ec52ec7be2237855
diff --git a/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch b/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
new file mode 100644
index 000000000000..c4888f0efb6f
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/898910
+https://github.com/hrydgard/ppsspp/commit/9874737087e8d24ea72b3f08b4975031b54a80a5
+
+From 822592c6b1441f7110e1cb15dcc5cd2ea1de8099 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger <Andreas.Stieger@gmx.de>
+Date: Wed, 5 Apr 2023 00:20:14 +0200
+Subject: [PATCH] Fix build with GCC13: various standard includes
+
+--- a/Common/Data/Format/IniFile.h
++++ b/Common/Data/Format/IniFile.h
+@@ -8,6 +8,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "Common/File/Path.h"
+ 
+--- a/Common/GPU/OpenGL/GLFeatures.h
++++ b/Common/GPU/OpenGL/GLFeatures.h
+@@ -5,6 +5,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ // TODO: Replace with thin3d's vendor enum.
+ enum {
+--- a/Common/Net/NetBuffer.h
++++ b/Common/Net/NetBuffer.h
+@@ -1,5 +1,7 @@
+ #pragma once
+ 
++#include <cstdint>
++
+ #include "Common/Buffer.h"
+ 
+ namespace net {
+--- a/Core/Reporting.h
++++ b/Core/Reporting.h
+@@ -19,6 +19,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "Common/CommonTypes.h"
+ #include "Common/File/Path.h"
+--- a/ext/vma/vk_mem_alloc.h
++++ b/ext/vma/vk_mem_alloc.h
+@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+ #include <cstring>
+ #include <utility>
+ #include <type_traits>
++#include <cstdio>
+ 
+ #ifdef _MSC_VER
+     #include <intrin.h> // For functions like __popcnt, _BitScanForward etc.
diff --git a/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
index 653f672374ea..c908641d14a1 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
@@ -43,6 +43,7 @@ BDEPEND="${PYTHON_DEPS}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-CMakeLists-flags.patch
 	"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 pkg_setup() {
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 58aedc033c5c..d1d16f01d337 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index fbe5340c84db..38adf6623627 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,5 +1,6 @@
 AUX manaplus-1.9.3.23-gcc12-time.patch 516 BLAKE2B a0cb41a3fa6e12ea557bd19af336f41fcfb31e374088124a87ce10e092cfc7f0ceb5c7e3be483f86fe76f13c1d78398337fd6f85eb431ab8e20cf92d775c558d SHA512 ddfe951a830a0b320e62a418ae5492044390e8c750d8e125d518f375aa7f79c976160e4cd03303a0033b72a501d62cc5e40f1f7c12670fc67e9a09e71854d885
+AUX manaplus-1.9.3.23-gcc13.patch 912 BLAKE2B 0797ac0928958aa8c2045af6027507ac90c1e3ae291947753d0bb2333865d0c8ef715c7fd6df53cf5820ea14a312a5fb88c288a0cc1bd7dcbfcc73fb6043aa12 SHA512 b4a2170320e60e4f6b4171663316a79ca262a6bf958e15573d81b7bc63d79836af39006b415aa5466f0eb2ca6118427dc29cae2a0fde7e1cf6bb9109c33b1f71
 DIST manaplus-1.9.3.23.tar.xz 15051860 BLAKE2B 6019799f13df0531ffcf662068f3dc85d31193a8db9fe6fa82b0c1c5740c527685efae822b800ca1836ec3ca00405f07ff368ecd3e0932465762e5f9efda7516 SHA512 0e74df08b4e18a826711c090e3ddf38da1b348c34acc1aff675c1f6c4dc523723a07b2b00d135a89ef136f11fe03f0dfc41e5830f0d6c34d5d44eb1414a2d361
-EBUILD manaplus-1.9.3.23-r1.ebuild 3097 BLAKE2B 83f13a85a369a15fb822305848713dc49232f6137bba627db012488a41a975a736505f5d4c0f193c19f69058ba43d88873ed7a2e864c1c6d027e326a63f3468e SHA512 7c2e6060aa6fdfe894e533a443c4710bdfe348e8fa7b56ab444e4b59ba2dfa714d222e7293876ac89f617a2e5a5381989318253eea70ae83b103605febb93b42
+EBUILD manaplus-1.9.3.23-r1.ebuild 3139 BLAKE2B 7c5b6666c02fbe4159d164e40963241494edc81710d8e9a138360da2c476715372710cf2c75ec4a0ed069bac8e45a9019f9dd26417c95b410495079b57e7123f SHA512 0dae6f40fc93e88c10f86b9c0d0dacd2d76931ca3b13581a1b3af2f64a4cb9c97a2c12e4d6e95c77c267338c6bfa7208cbe1cd9b0c4fc0aae0ae9475435034c7
 EBUILD manaplus-9999.ebuild 3037 BLAKE2B 6c98b953e8337595921075f8cc70c40a54a6a3c415e6665efd17522aef1ad75d8a4822e54eddd7bed76904c2cf1c595cd521dde495e82677dfd0b585237a59a6 SHA512 43de8bb443ff96a535cf86c5a03992872fc0f40d49c41c36137dcfcb3f952c311811135a19a45cd4b3f9c18cfa4b0a0e28e54dac5a4288955d59e839662735a8
 MISC metadata.xml 584 BLAKE2B 8a3a7aded808b8593f7433cc35bcdd676fc4240270df11a58ae92c80c56e97a8e9de9a3d1adb0ad112bc04360719cedfbb6ca66e498a30ba03af4be05c2224ff SHA512 cd328ace8a351048ab3be7120c8890bfeabaa554dcb6da59c4df7061b3faa0587f4256e3fa06e65f754bcdc20a33c5417f14990f8bc4d2f99e82394a4eeaeb6b
diff --git a/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc13.patch b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc13.patch
new file mode 100644
index 000000000000..1a2ae7e078d8
--- /dev/null
+++ b/games-rpg/manaplus/files/manaplus-1.9.3.23-gcc13.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/899028
+--- a/src/net/ea/chatrecv.h
++++ b/src/net/ea/chatrecv.h
+@@ -23,14 +23,7 @@
+ #ifndef NET_EA_CHATRECV_H
+ #define NET_EA_CHATRECV_H
+ 
+-#if defined(__GXX_EXPERIMENTAL_CXX0X__)
+-#if defined(__APPLE__)
+-#include <tr1/cstdint>
+-#endif  // defined(__APPLE__)
+-#else  // defined(__GXX_EXPERIMENTAL_CXX0X__)
+-#include <stdint.h>
+-#endif  // defined(__GXX_EXPERIMENTAL_CXX0X__)
+-
++#include <cstdint>
+ #include <string>
+ #include <queue>
+ #ifndef __time_t_defined
+--- a/src/net/ea/traderecv.h
++++ b/src/net/ea/traderecv.h
+@@ -23,14 +23,7 @@
+ #ifndef NET_EA_TRADERECV_H
+ #define NET_EA_TRADERECV_H
+ 
+-#if defined(__GXX_EXPERIMENTAL_CXX0X__)
+-#if defined(__APPLE__)
+-#include <tr1/cstdint>
+-#endif  // defined(__APPLE__)
+-#else  // defined(__GXX_EXPERIMENTAL_CXX0X__)
+-#include <stdint.h>
+-#endif  // defined(__GXX_EXPERIMENTAL_CXX0X__)
+-
++#include <cstdint>
+ #include <string>
+ 
+ namespace Net
diff --git a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
index f481e1cd9b21..0780865cfa73 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.3.23-gcc12-time.patch
+	"${FILESDIR}"/${PN}-1.9.3.23-gcc13.patch
 )
 
 src_prepare() {
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 1ca9f9653170..6299bcac808f 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 1d2af2014254..bdb8e79281d8 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,8 +3,6 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.19.3.jar 47162712 BLAKE2B 549678fc5c110b42b444b565142b299f13efaf2fb4f148e2f050f1f9701f0e81870ba777f021dfcd1d494cfacbb9e8dac5ede62b5315a93b367f55ac2c582d94 SHA512 1a3b9930df515cb8b8be9a212c2b3b6bb4612968aca5f5bb00a15eb70bff126bf96f51aa5c6661fae0b16eef629843103c6ae73cf6f2c8030314b82d2a03a189
 DIST minecraft-server-1.19.4.jar 47515675 BLAKE2B ab4f65ce8e08ea790d3ef4e291dd1eadad0931bd5cf39771ed6571089c556cb85786987c0f9e22c2aaf4b000400a674c85bf157382c6840cd65fcaa33ada70b8 SHA512 a4233e35aca4ade4b2d7b8047c990d40ef81e832ef693b583a08b963ad9358c0abe3ccca656848ba649aaeded2a37ac585099bee24036a8abb1e7541eb91e96e
-EBUILD minecraft-server-1.19.3.ebuild 1166 BLAKE2B c128871e609a2b3f98bc96ba3bfc57cc22976c9f2f0e74c126f2eb17513bc70c9d824d430e35a826f28d4b45ef19a60f2c71e3239ab256612762d0f92d502f96 SHA512 c7783b6f802d598705cdde7e23c6d807a5cd624dc76eb3e88b6819c6b57b523853cb3882c969c7931417293598a4b94761edd96f2c427fa5b56a8b0e9d4f5674
-EBUILD minecraft-server-1.19.4.ebuild 1167 BLAKE2B fbe7dff747b4d34f8069f8c88b030b957fc6daf0daa0f8ec24cb3b68fb733e0e7d6b2cec2a4d4e032034ec50fb6ca97dad63ca83c62c0815e07d91d3168311b6 SHA512 edc8ca8d17754f59ca06d80d638b12d356a0a153e51553e65e0840381203ae9be238620d2271c39520b92ed3f2830ca669368a6f16e6ebf6e24178e5e19b8384
+EBUILD minecraft-server-1.19.4.ebuild 1166 BLAKE2B 90f1f328e0d325540023f5a3168749b85c1d44f1e1ffe27e09d3b0fe302eb59945f68966d1376db95a4ff77200e963eebfcf4d20dcc6c8612ec7e951b255e839 SHA512 3817a721c6d3f7393c4cf713d94aa6282644ca0b508c85458b2530dfe6fba03f06c8dc0f39802b4110e17d9279e09b1847d7b98d9361e330c67f0765e9ef9972
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.19.3.ebuild b/games-server/minecraft-server/minecraft-server-1.19.3.ebuild
deleted file mode 100644
index c88fce5540dd..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.19.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT="c9df48efed58511cdd0213c56b9013a7b5c9ac1f"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.19.4.ebuild b/games-server/minecraft-server/minecraft-server-1.19.4.ebuild
index 6760263d56a3..3eb4af6ceaeb 100644
--- a/games-server/minecraft-server/minecraft-server-1.19.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.19.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
deleted file mode 100644
index ccb890d0ff82..000000000000
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-# basics_universal version
-MY_BU_VER="1_15_update2"
-# meshoptimizer version
-MY_MO_VER="0.16"
-
-DESCRIPTION="A spaceship bridge simulator game"
-HOMEPAGE="https://daid.github.io/EmptyEpsilon/"
-# This bundles SeriousProton as the build system does not support using
-# a separate SeriousProton instance (and currently EmptyEpsilon seems to
-# be the only consumer).
-SRC_URI="
-	https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz
-	https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz
-	https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz
-	https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz
-"
-
-# EmptyEpsilon is mostly licensed under GPL, however the art ressources
-# use Creative Commons and the bundled SeriousProton is MIT-licensed.
-LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-cpp/nlohmann_json
-	media-libs/freetype
-	media-libs/libsdl2
-	>=media-libs/glm-0.9.9.8
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/EmptyEpsilon-EE-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-cmake-meshoptimizer.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == "binary" ]] && return
-
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 11 ]]; then
-			# ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29'
-			eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler."
-			die "Need at least GCC >= 11"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	local -A externals=()
-	externals["${BUILD_DIR}/SeriousProton/externals/basis"]="${WORKDIR}/basis_universal-${MY_BU_VER}"
-	externals["${BUILD_DIR}/externals/meshoptimizer"]="${WORKDIR}/meshoptimizer-${MY_MO_VER}"
-	local link
-	for link in "${!externals[@]}"; do
-		local external_dir=$(dirname "${link}")
-		if [[ ! -d "${external_dir}" ]]; then
-			mkdir -p "${external_dir}" || die
-		fi
-		local target="${externals[${link}]}"
-		ln -rs "${target}" "${link}" || die
-	done
-
-	local serious_proton_patches=(
-		"${FILESDIR}/SeriousProton-cmake.patch"
-		"${FILESDIR}/SeriousProton-Add-missing-include-memory-to-websocket.h.patch"
-	)
-	eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
-		   "${serious_proton_patches[@]}"
-}
-
-src_configure() {
-	local version=( $(ver_rs 1- ' ') )
-	local mycmakeargs=(
-		-DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/"
-		-DCPACK_PACKAGE_VERSION="${PV}"
-		-DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}"
-		-DCPACK_PACKAGE_VERSION_MINOR="${version[1]}"
-		-DCPACK_PACKAGE_VERSION_PATCH="${version[2]}"
-	)
-
-	cmake_src_configure
-}
diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
index 712b44d5d70d..2e760b51db7f 100644
--- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
+++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
@@ -16,10 +16,14 @@ HOMEPAGE="https://daid.github.io/EmptyEpsilon/"
 # a separate SeriousProton instance (and currently EmptyEpsilon seems to
 # be the only consumer).
 SRC_URI="
-	https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz
+	https://github.com/daid/${PN}/archive/EE-${PV}.tar.gz -> ${PN}-${PV}.tar.gz
 	https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz
 	https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz
 	https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz
+	https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch ->
+		SeriousProton-2022.10.28-add-missing-cstdint-include.patch
+	https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/${PN}/patches/musl_and_ppc.patch ->
+		${PN}-2022.10.28-musl-and-ppc.patch
 "
 
 # EmptyEpsilon is mostly licensed under GPL, however the art ressources
@@ -72,9 +76,14 @@ src_prepare() {
 
 	local serious_proton_patches=(
 		"${FILESDIR}/SeriousProton-cmake.patch"
+		# https://github.com/daid/SeriousProton/pull/236
+		"${DISTDIR}/SeriousProton-2022.10.28-add-missing-cstdint-include.patch"
 	)
 	eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \
 		   "${serious_proton_patches[@]}"
+
+	# https://bugs.gentoo.org/895994
+	eapply -p2 "${DISTDIR}/EmptyEpsilon-2022.10.28-musl-and-ppc.patch"
 }
 
 src_configure() {
diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest
index eea304275a9a..5f3b2acce63c 100644
--- a/games-simulation/EmptyEpsilon/Manifest
+++ b/games-simulation/EmptyEpsilon/Manifest
@@ -1,12 +1,10 @@
 AUX EmptyEpsilon-cmake-meshoptimizer.patch 457 BLAKE2B fcef3984e5154ea1819109b89398be0c519f699296d7f64070060cbce888fa8f8c12aac77f9db14c607ef8f7499338e41ef84cb6c6778b2e5198f9e0d795ae77 SHA512 c171fb453ff71c5925508cf6eeee821dadfd95b38470596f5719de1f711eaba31a361289e5f3efe31bc83b778aa5850f1c3a1fa766fb1de98aa6e8ca8938b82e
-AUX SeriousProton-Add-missing-include-memory-to-websocket.h.patch 706 BLAKE2B 12129f7eca18439840bbbf53968ec0f950158dd01659bf7923a126b1176678613c704e9b00f7817b281095d5ecf859d29832295ab19b8fc63526882f565aa31f SHA512 3be656fa7c883e91df93085d8b5cc296d4912723b785472c187abff3e51562d5f0b82a2fea6bcd47c58dc00294b9302cfb6a97256456e990f246ba60bad6f725
 AUX SeriousProton-cmake.patch 450 BLAKE2B 1f1585eda5dcf7980d4439e1485edf4363dba5378c968f387c3b978eee9a9c5d7bdd406dcdc207dbe1e93f1efdf88285995cc3a5a414e1dc4566123e7685388f SHA512 bc09fa1047f1cc33c5d27ffd640d6e06623f83bb49263786bdab25e3fa353fbddef4d15203197ecf58eac696f92f27b47b9eae67a872a49bda2c11579741dbcd
-DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512 63f351be1af792be0ce8b1171ea14dd9f3ab75825ca9df48f7a7bfbc3cedfe05183f59896a51cd4e1f4e977aa5c9386159716dcc206afd7a1adab1df7c35e062
+DIST EmptyEpsilon-2022.10.28-musl-and-ppc.patch 5440 BLAKE2B 7a3f20e5c6595ec037a1855f22b59dc979ff4f69bdf87f8bff09d32f2aedea60595ef4647c87ce182738352d00eaf54f1778dc8d3c46de96b7c7a4cbc963bab4 SHA512 bb555c3752348a4f23c5764542f8b9902b7532222358517463c04f044fe50a98e47a890fd425d2c4c38b6aa1eb7bc48ad508ad08ba5811b2825e7f0483f5312b
 DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140
-DIST SeriousProton-2022.03.16.tar.gz 2671635 BLAKE2B 9fdb58d50e7f3522678efe14b753016c4d2e3341f2e3b78ede00815e4f6a6361eb635016c9cdf0ce235a0bb35fb813b61790a5b0d1522a1e8afe2f3594674341 SHA512 74a06c69a3f49789b35a6e5795a7b1de1b7e79d36c956a92e1383f9983489319060c62f3ee6349e26ac985a5121b4e60cf7a3546ec78b3a830e30c0c99ccd023
+DIST SeriousProton-2022.10.28-add-missing-cstdint-include.patch 850 BLAKE2B f193fb30b39e7b07caf0018fc4e32430ee451baaf63315110e204e7e6f3aff84448a3a5cc83b60e642c27cebb39f532065bd1126f5646ac70645c1c341c8e464 SHA512 3645efb49ea012a31da0414a454bfca46170dfdfd90db7af07481181d75b87c621e7d8ba2ee9752c49d978ab0e5080f01b81eeb07cf1ce68425066c8a4111c2b
 DIST SeriousProton-2022.10.28.tar.gz 2668713 BLAKE2B 9f200881bfa812904cd37428eb2bb2f8e04c46a134e8b3fceb0e02e87fe4bd7e529e1fbaf18cb4e284ec7ee4d1c6e8606f35e7ec3e61efa66816a7b354d446b9 SHA512 7955ed78529c0f69d6fd3ef6fac5537009548cdfe1cf8e47dc1fac8919fc3532e03453869968369f027c40dd4da513cfd84e58ffedaddd4b9d9fe67d28406be7
 DIST basis_universal_1_15_update2.tar.gz 13283133 BLAKE2B 5400d23f86dd581da1bc96c1b95eae58f3c97b5412ad1d09d7f4ffd2ae7cae6cb14330795380e253579cc17f1ee16c91555229268219c300905da1420c0d8717 SHA512 a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32
 DIST meshoptimizer-0.16.tar.gz 342571 BLAKE2B 2b4e244ea3676f109c904261d47bd0e7b2ad440f23d65325d34281ed13ac09657116c96b5a56860a0107479773b58c21018c8825b314f87a05bce38341fd75c1 SHA512 cc6d28359fb99a615e1046a4af1b247cbc6ea0266d9e7f41ea0516c1fc09fa1e67376071daf138a126c77bca3baf9d565636ed0e3adf045f1a08498c38b7a7e7
-EBUILD EmptyEpsilon-2022.03.16.ebuild 2844 BLAKE2B 475c559eb8741d6aafaf315dd837ca71d3cd82990c149a018cb2107390aa5542b899dc8fc1a6a10844dc281ac53d6aae99e0856889963b9d4fe8f510553dae32 SHA512 038c54763a17e43c7ff334fe5de2e748609064729f0cb66dbc53d1cd95cf8c7906d32c5f7eff80c3f2aeffebdccd10a998d4fabf1d2b209854bc9ae1015b1aa5
-EBUILD EmptyEpsilon-2022.10.28.ebuild 2765 BLAKE2B fba0c42d0d180e2389a5fe787e4798421095c5be8f91c9121e31082976821cf90f241347d809167dc607aced60f463ccc39c81d9234ac40bba89daa962adae0e SHA512 a69cea4a5c56c5c7451414babfb083630cc6bcae2fb3d83a3dc54cfb3eab644fc850d4c0d7e0201b6f4ad272f70c21a0f4afbf16cb5b4c137242562408175aa8
+EBUILD EmptyEpsilon-2022.10.28.ebuild 3313 BLAKE2B 6ca242823d873f5ff1253b5839aed380b7b7a2070a792240b366fdde19cd762b030a936e05d34b9f36e524199ceaa6cf027a7f8883248b031e677095002db68a SHA512 fa466763638a47d68eedf3d45b74c0f256bedc176b7c5cb9e5eae48e3e97370c0a904579bb015544b89b5c4bf009575d47d111690b37dffb2df4cd613df80655
 MISC metadata.xml 329 BLAKE2B 8473231ca386ac0a49c270619d7dbe528f578e6dafda3aff92309e947fdae58e6a09b8895e9f051dcf4f70854351756188463e2a987b03939eb41d3cc9346893 SHA512 75c1304961cb113e7957b9f40e091f343af41f7ab74ce59ad20840a883179e8123cc571f6cf45f77ca15bebadecee5e0ed945dc7eae614770b1f943fc195e7b2
diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
deleted file mode 100644
index 861eaa781e8f..000000000000
--- a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9fe127233eae44f14e37900c3f54e8a305d2f161 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sun, 22 May 2022 12:36:08 +0200
-Subject: [PATCH] Add missing #include <memory> to websocket.h
-
-std::unique_ptr, which is used for the 'socket' field, is defined in
-<memory> but currently not included. Starting with GCC 12, the missing
-include will cause a compilation error.
-
-The missing include was found by Gentoo's CI and reported as
-https://bugs.gentoo.org/846935
---- a/src/io/http/websocket.h
-+++ b/src/io/http/websocket.h
-@@ -5,6 +5,9 @@
- #include <io/network/tcpSocket.h>
- #include <unordered_map>
- 
-+#ifndef EMSCRIPTEN
-+#include <memory>
-+#endif
- 
- namespace sp {
- namespace io {
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index ab2cb4d46126..b46b85ffd2e5 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 30e191a04217..e2603424938e 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,15 +4,11 @@ AUX openrct2-0.4.1-gtest-1.10.patch 269 BLAKE2B 40e85e87627ca627faff555248a46307
 AUX openrct2-0.4.4-dont-force-downloads.patch 412 BLAKE2B e13a6e7d6710bcc47c6d84a42da4ae4cd43466c8653c254ac631bd04b7f5a9490fe8232232109ebc70c744beb471e77369dfbc2f60e83159929f608d6b7f52f8 SHA512 58da023daee588988c98df3b937dc1029db7a3663fe8dd9d8f166047145433d67033072d7b8a9bf245433409867c21c6d4b132281961281983abce50bd84146a
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.4.3.tar.gz 16507904 BLAKE2B 37af2ff01f3ad143ab42dc37c95391480272637e163a8721878ac54b001ac49557d4100eaaafb21961ae6abab30b0f60c150bfba88205d2a77e4229e96e35424 SHA512 2c194e3d63340c61fd8caaf975e3b99a3a9f10aeb5f9ff0ca4f5556f07b2d4765583b0c63d1c77117cc003fcfb8403e8ee025758ff39027e9bd0992931eaa46c
 DIST openrct2-0.4.4.tar.gz 16554655 BLAKE2B f0770b7db82b9df5325e8740b5aa88889ac5354b07b271c824f9521ba02d0bc3eec395f216305d4737c8ad36a3096281d1a7ecb019a6514399b7d12dec0dd526 SHA512 8e969e08023a6232dfffa31593cfacedafdf5eb778d1c1471deb095b3d056006ea0c1b219c9042f9fe94118fcbde219580ba2fca29d70a042a016a7fde0abdc9
-DIST openrct2-objects-1.3.7.zip 4563769 BLAKE2B 5e8d88899d997b550df7b34ef6b2788e216861817b49f7c937127f97ec9ea8e02866e768f00e507ccf6310f7cbdce170decf021e1fddae88f219f370aee80f0c SHA512 b335cdb26a9fb20e25100c24409d3bf6c9e9de1bded79534bf8e62c198954ed6732a7524e261502e3e81941c8ba7b1e7cf9541ab121f448d5a8487bb28eb1b38
 DIST openrct2-objects-1.3.8.zip 4583315 BLAKE2B 84f104666671fe7b677390e0475fdd0b7a417ab52ece7e7b6ea8dcf5ec21cda5ffc95cf5fb989d3e8d2a353132580eacafbee3a5655c79e4528328fabc607af0 SHA512 e0ea72334195ce2d608b9a6e4102cda33271834d71783b6a0b0e408a41a6b240adb021f28ada8184ffd0720a9ee0bebbbd50635321c39c7f3229c51544b0bc9d
 DIST openrct2-objects-1.3.9.zip 4583285 BLAKE2B 90f200138254a3846913e94021fb6a19ad18590f940a814e61d848c64c9c5eb403476d759e1718ff1e1316ada1443c6a119695e8a66c51e2686f22f6e8efa8d7 SHA512 b671ee083e1317c4849f3a75009169d45102cc7a6241b5b9a079c896e8bce8bba63bd08cdd90b9aa562a18a8e023f954e411b096b21c9b112761a8b95bea69a6
-DIST openrct2-replays-0.0.70.zip 1479468 BLAKE2B 862eed6955124d5a5fbe289aee8cfaca2b4b13c680174b041d9e6f79cd02fb5b2cae42c8ae5d58493b1896824fdde75a138c071192be6f46463e0ffa293accbf SHA512 f874c931329cf78c8e4b438eed05c7340bfb920a9b0d6394165a22517543efe4f760f112579aca20e0576659f0103558083af975d9486dfbd307ad61506c811f
 DIST openrct2-replays-0.0.77.zip 2042154 BLAKE2B 38bce55f91f49a485d158a94b4ce553ffa606f652cd766b33acf299b86304ea0507b50441b2a9b1fb219b90a0dc2426eff5988c2b128a97e399b00c3392f10e0 SHA512 52e4a237b1e0be89422060e5c8f8d5a783ed81f1ccf6b205f0e73f8faf6eb9408dbddab31a411f6ad7554815e89b8c63329052aeafeb739bad06c9ac1b7d6a32
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
-EBUILD openrct2-0.4.3.ebuild 4084 BLAKE2B ba77506bef56c2f5b73b1d73dd192146c4bde79512fda8899f6b42acf55132a256d2265cc1248e7cd130cb9f95742958a3708609fd427aecefba28df07451d10 SHA512 f21bca2a421ebf74b35416bb395f43eb1b78ae3d6945f329b0e86142078649ab9e6211f3da3aaedea0ea9d93ffc9224245a333c6891fb7b631a6b37c9a28dd86
-EBUILD openrct2-0.4.4.ebuild 4140 BLAKE2B abde0e0bd68a8aa270431047df474987b72ebe9efc2dd79904f37b6cb4f26b08be846021154c2546cc2f6e3b76a0a7b426b14fcb427ad3af90b62fe49e82f07a SHA512 adaf20f201437e29b0533dadff17c34c093c9524cd5eddeb580891708cc4b75f082cbf146a67d95618b5b6fbfac8f4472a61d3d23a08b107586d8b855e008278
+EBUILD openrct2-0.4.4.ebuild 4138 BLAKE2B 15cebd84f8a04f4b933b5f76b0b4cecfb1d8155a6bafc1f110ab07ec8c904b09474a273163aa851f8d10da93a00202bd41b16e9cf53117363dda648d0ddeaecf SHA512 4613ca282abfc88168f6740b2fcc5364ce4d4be99cd502e3ce074678fd0577733ee3c6cc3519771673deea4f3b49faff13dff610bfb491d0f37ea25ad7d0fc62
 EBUILD openrct2-9999.ebuild 4043 BLAKE2B 724be74afb8d713a19fc508c16a2af8eb1cb3fa88e045c61f66a077f56392e20289a486af7ba896427df4ccb95829429d2ef3be3ac343cefc445577116b45c94 SHA512 88522a805f7a12ecec7c61805e8e1b3a84704fac2f07b2950e38b2ed02c292e6e4b9b8dd08aa349d90abbd2dc5d6a1dacec2f5d2d4883ca37600fcb37c48789a
 MISC metadata.xml 1200 BLAKE2B 7a2ca04e6e757efd12cbf00558372a19d10833fbd11d105f14bf68662ea6c64cbac3b01b4f5abba1473c4c184cceeadc26b38ef91e9edc3a40ee94415f868ff6 SHA512 97c181f7f3d97bf8ef90c1666497397c8ad87b23b536d1be6af7133e85e1e331813ee2247b3e0dfe887c0328f0b35184f1e9738ba7a7bb53b80813c23565c61e
diff --git a/games-simulation/openrct2/openrct2-0.4.3.ebuild b/games-simulation/openrct2/openrct2-0.4.3.ebuild
deleted file mode 100644
index f48fd8b0b4f9..000000000000
--- a/games-simulation/openrct2/openrct2-0.4.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.3.7"
-MY_PV_RPL="0.0.70"
-MY_PV_TS="0.4.0"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		flac? ( media-libs/flac:= )
-		opengl? ( virtual/opengl )
-		vorbis? ( media-libs/libvorbis )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.4.1-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		$(usex !dedicated "-DDISABLE_FLAC=$(usex !flac)" "")
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_IPO=ON
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		$(usex !dedicated "-DDISABLE_VORBIS=$(usex !vorbis)" "")
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_OPENMSX=OFF
-		-DDOWNLOAD_OPENSFX=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.4.4.ebuild b/games-simulation/openrct2/openrct2-0.4.4.ebuild
index e78165775ba9..9c148027281d 100644
--- a/games-simulation/openrct2/openrct2-0.4.4.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.4.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated +flac +opengl scripting test +truetype +vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index b4ed1e3d8225..72ea0f8cbdc1 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 14df47a27d6e..d6edc636f801 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,8 +1,10 @@
 AUX colobot-0.1.12-includes.patch 1283 BLAKE2B 0f1e402e770d57365d53488b86838f401815e0749065bf2581d228a566873b31d021a1486ce7cf4a051407b96c540c954ce56ef9efc168522f0ea94ec1606fcd SHA512 26c1bbbd9605482a5a6ffef4b3a919518224e3802bcf0d7248bba94227039bf69a5d6a41bcacdb1ec170e58e719f1cde722f869c4ec26cf20ecd7d1eae091cd0
 AUX colobot-0.1.12-sndfile-link.patch 2114 BLAKE2B 11aebe223c809301fd7851ed20ab0867f47ca6d41d198951a81dc4d23a80d203a6955bc4df06dd09f9131fc6ed5f5cb5c1c001503564e89dde3143f58fa7cb59 SHA512 c4f15073aa7f9f84ca369f56944d8c3daba67b419f7d1a4e886b23bd210f84268beddeb13bb9dcb88a86e9dd1bc24a4364ed4bd2065062eac771002f367150e1
+AUX colobot-0.2.0_alpha-gcc13.patch 623 BLAKE2B 33d5a6596a3f256af030e7bab37a4985374b98bded72b682aaaee162ed3360d26a407611d58ffc04bc08295de443183e7e4fa14152b204bb92d66ab7de6160df SHA512 009cc5fe8193fc9a014b8aaeb7203a257eeea08ee27e0fb9867a1ad1d7bd9652ed9a8a1df26f7b44dbc6753179b789abc5283d6e408e09229afda8c675bf59a6
+AUX colobot-0.2.0_alpha-werror.patch 1253 BLAKE2B e4536598161ed2868acdd63105016a6ce2f29e8c5d3577d21b7d8171fb6d21b638502bcae72760dd1c6ead63c3306d8612a5e2cc4438625e20e227412a743a44 SHA512 78e9e52311ff1b2c01f722df00fb9c5ece7427f83ed5a317007e456974edb8ba77606e0ff7757d081ead1e92099382584fdc4d9d31cae463c28acd37249d2612
 DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
 DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
 EBUILD colobot-0.1.12.ebuild 1616 BLAKE2B 0044f75977deebfdd035bc6b0a0815613a2f9bc00aad6a5898737b8884089842d2d8d1185bbb0cfdb04356a431ee35aea37c53610daaf6276088a7d7f55d811a SHA512 58ffa32138e8f26109bbfcd8604bfa358db0fffb49949ae5efef9d3e638643b9edd1da7f972278e4285fcee0bbeaacd69dba82a828ad89accd1564d7dbfdf4fb
-EBUILD colobot-0.2.0_alpha.ebuild 1553 BLAKE2B 5656ce11f0209337502a1dd06a8398823cd246224e0c452a04e883beaf36baf6f3f0e06c6dc33c53df094a36c62e60628d94516aa0dadbed6805abdb2634c9af SHA512 126800bf1bea64d9d47f70a8406eccf05a1fb88789be14bee462ce00f5952ae6b70d804a1a0b5267d148de7a622d66706cbf4f43e11d2f5edd903e9b56bca1c8
+EBUILD colobot-0.2.0_alpha.ebuild 1710 BLAKE2B 4d90f3c7e52b75ea0838613e8fa41ac8e8c01882dd4a08a252c9cbee184a1dc2ada30364095bff464208c01553a9df28109357d85f4ac6ae37ebfbeed1656ab1 SHA512 5fc007e57d6a675d012e32d924201fa43545ebdadfdeaa2909fd7fc7ebfcad4445240e6832509dbd120e802ea8c5987877d0fe8e07169ecca1f3349e26b90214
 EBUILD colobot-9999.ebuild 1377 BLAKE2B 98d1de0557f5edc06166bc191e5fe1beb4bf0f7f8975069d81f2a8aaf005c17348f649f477a3c16ab5aa5b35130a10607bb5395266c1c983816fed0b9f811bb2 SHA512 61b61b0cdb4c29348333c30a13c1986d69587164734bc2c52e07e63b1d5b795270bae19642055662155563b1cc91cd5cb7697b1172fecd1ae375702e879dcbe8
 MISC metadata.xml 419 BLAKE2B 8f91e92cb3ad10979daf436e225f9a19c0b69f71e6ad33ea6fcdcc49eefac1c4373615ebc54ac24888377c63b797e06a9479bfc485fef0208667b19602f88f2b SHA512 d8fae70775286b79f9a0942dc89bcb5214f4833fa7cd539d9e30e2b8e6762968c8a8ea933765ab9c81f2cad30a4aedc88377221c7be1b342267b8a79b9bb04e7
diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
index b49ad40a24db..f16813414298 100644
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,10 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	# https://github.com/colobot/colobot/pull/1453
 	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
+	# https://github.com/colobot/colobot/pull/1576
+	"${FILESDIR}"/colobot-0.2.0_alpha-gcc13.patch
+	# No -Werror
+	"${FILESDIR}"/colobot-0.2.0_alpha-werror.patch
 )
 
 src_prepare() {
diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
new file mode 100644
index 000000000000..f74dcb56db25
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.0_alpha-gcc13.patch
@@ -0,0 +1,26 @@
+https://github.com/colobot/colobot/pull/1576
+
+From 96d32db288ccd5ab13afdb2a063ad9e03170c4ee Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 19 Apr 2023 05:18:06 +0100
+Subject: [PATCH] Fix build with GCC 13
+
+GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some
+are no longer transitively included.
+
+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Bug: https://bugs.gentoo.org/899034
+--- a/src/CBot/CBotFileUtils.h
++++ b/src/CBot/CBotFileUtils.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ 
+-- 
+2.40.0
+
diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
new file mode 100644
index 000000000000..b326a0c0f7af
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ 
+     message(STATUS "Detected GCC version 4.7+")
+ 
+-    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
++    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-declarations")
+     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
+ 
+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+@@ -177,7 +177,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
+     endif()
+ 
+-    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
++    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
+     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
+     set(RELEASE_CXX_FLAGS "-O2")
+     set(DEBUG_CXX_FLAGS "-g -O0")
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
index 862502a880fa..c3aa4201da08 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1,7 +1,8 @@
 AUX endless-sky-0.9.14-dont-compress-man-page.patch 602 BLAKE2B 9aaa08338ed26e53f5eaa3e42a0aaa8c9c8f56099518a688d3f91fd860945a883252345bd8f9df9b6d591751afc171f6d6e845c86083bc246316fec6e5d3eb7e SHA512 a3b951be268b8e6689da97b7ec77ebb7a5d65a6381dbbdfd0b607c62d2d0418f78290189b6cf94c33acfd238c7c8b1b5b0737629486ca2af18d9022ada1789ec
 AUX endless-sky-0.9.14-no-games-path.patch 1919 BLAKE2B 7650a1e3a355a0e9a591f191fbc2eb0f5400924cac7fa2ac0ef3419a6c7c6524e19956907c3904267c9ba1e1bedbceb7b5fa19af07316c6137c9075f9a051c03 SHA512 c9b867fb0d8c82a1ebaa5bc04ba615d39d81031bcec204b5e5a3d0daff040ae30f59ba4f80e76ca671db0a9073c63ad0b3cb8f125ca628bbaa1774c212e6c2b3
+AUX endless-sky-0.9.16.1-gcc13.patch 1318 BLAKE2B 31a147234d4f071e566603fa3c29d43b421ebd762c8170a243e051f69a002ed86d2c81d581789bdbba516e7954edbb3745d1e21acbc8f0b8490e9d3a8643b27e SHA512 be5a394a939456e1a82aec5146248e9ce4ae532e9df94765f9f83222ea1235b2d27d39247605d0969ea2414e0f55fb2011dd737859fcf6c7bb2c3a16f3729c4b
 AUX endless-sky-0.9.16.1-respect-cflags.patch 389 BLAKE2B 1dc481b771fc9ab5af455c623aae6941d3b81b7b74ad031e7702dfc6a3832713ea040130a81ddee1c1e129758d85a0e25eff74bca4fba66b7cd940a9373bccf9 SHA512 a309b981791ea81538d8ee47aef4b590cf01af024280e73f883ce8145621a533daa404b87c04f7545bc8922be9dec77c8c4c0142dc2b3e490cd5e252d0087cf0
 AUX endless-sky-0.9.16.1-test-libs.patch 448 BLAKE2B 41c7617f7087140cee0540e432540098f47d6c2037b02da2a594899b8140db32c40676611a081f56767f48707daf9e5eaebf48eb81ec0ee03d57cb2afa1d0d1c SHA512 fe4a698de27a48439e7a205ce36b0eed29e8f5264422717c412be5726dedf236ac20668a20e850d2cb14782b5a1351d20582dc065b502bef978ab89416658ae0
 DIST endless-sky-0.9.16.1.tar.gz 184582283 BLAKE2B 3c35df96b54546811713b123bf43993df6ba5271988decd7408722263c2edd904c84888db61c2d22554b3f60edebd25db7913e7784f309ff936d37c815bc6650 SHA512 83e0a47160506b1e3608f67534e2dbcf51515d809016efc379448d14331229ffe26360f82cc60c565c84b10c605aec846efc19bcd4af10ee116e5ef8fc804d56
-EBUILD endless-sky-0.9.16.1.ebuild 1720 BLAKE2B 7a5687d7b956134c892262757a7d248d91486158a439f6b8c557a1954b44a7a47986ca11b17667b8a16979dd5f8515c42db6d8d9e9a69845374be574db67df1f SHA512 a61bddf9a8c05cf15e709d849c690a58c507372f7a9b4ef76e43d9ced6ff5dc57e075271a15ff7a2a57b21342b1bbf7725c7ae7b047f441c4a862349f170c1e3
+EBUILD endless-sky-0.9.16.1.ebuild 1762 BLAKE2B ba2bf3543486736cd070abbb4b7a7369f3f079eba63ebc0220e0a9bc72d7e8cad0514d8c4ca19ebf0b5b2dad0b875464c40440c46af4e48de8e0549e8f0a3123 SHA512 199578d6d8e32c3006456a54987ed4e0cc7c6d97a26cf5ca0694273d62f4e5e1ea9c45d518eda253e6e059968d39d0bbbe4a982cf65d867c0aef8a3349ac5401
 MISC metadata.xml 732 BLAKE2B 05e221e5b8bc45baf62a5361a1fa11affd5bfce04bb1ed4127251c151771df72c873e9c2deab4aa9b4800fa3314fa768c635e61bf941e3eb74241ee5f2a8aabf SHA512 2aefeccd986719aab4be77af1bf4458b36a873918c04905f9b432a591a44dfdd001faf29ab16ced565c069e846bfe5a96e2c12ffa1e4d62a7b202cf7fc356949
diff --git a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
index 3d0b78c57dff..709d7de7ed87 100644
--- a/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.14-dont-compress-man-page.patch
 	"${FILESDIR}"/${PN}-0.9.16.1-respect-cflags.patch
 	"${FILESDIR}"/${PN}-0.9.16.1-test-libs.patch
+	"${FILESDIR}"/${PN}-0.9.16.1-gcc13.patch
 )
 
 src_compile() {
diff --git a/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
new file mode 100644
index 000000000000..428e67da568e
--- /dev/null
+++ b/games-strategy/endless-sky/files/endless-sky-0.9.16.1-gcc13.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/894782
+https://github.com/endless-sky/endless-sky/commit/a85df936c24feba6eb5f7f484c160aff0a60d6cb
+https://github.com/endless-sky/endless-sky/commit/7483f72cc72511786ba3aac13b4cbe0848a2aefc
+
+From a85df936c24feba6eb5f7f484c160aff0a60d6cb Mon Sep 17 00:00:00 2001
+From: Heiko Becker <mail@heiko-becker.de>
+Date: Sat, 28 Jan 2023 16:29:40 +0100
+Subject: [PATCH] chore: Fix build with gcc 13 by including <cstdint> (#8235)
+
+--- a/source/ImageBuffer.h
++++ b/source/ImageBuffer.h
+@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
+ #ifndef IMAGE_BUFFER_H_
+ #define IMAGE_BUFFER_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ 
+--- a/source/Sound.cpp
++++ b/source/Sound.cpp
+@@ -20,6 +20,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
+ 
+ #include <AL/al.h>
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <vector>
+ 
+
+From 7483f72cc72511786ba3aac13b4cbe0848a2aefc Mon Sep 17 00:00:00 2001
+From: Nick <quyykk@protonmail.com>
+Date: Wed, 8 Mar 2023 19:41:40 +0100
+Subject: [PATCH] chore: Add a missing #include, caught by gcc 13 (#8511)
+
+--- a/source/Preferences.h
++++ b/source/Preferences.h
+@@ -16,6 +16,7 @@ this program. If not, see <https://www.gnu.org/licenses/>.
+ #ifndef PREFERENCES_H_
+ #define PREFERENCES_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e3a50f6b3a1c..bd5506fc870f 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index bcdd61819480..79b51985313b 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -3,6 +3,8 @@ AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAK
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
 DIST gnome-settings-daemon-43.0.tar.xz 1453808 BLAKE2B 365a1fe4d253e84b9fc355331688951e1428eaee421afbe052a16226c7006a420f28134b5fa02929bbb1d4250af243b02594444a4bdd208e5c41ed9e63e5f979 SHA512 8cc3ed73fa66d2cf72621db78be68e4fe01f292ab3987aff8cc67a1c67d910622e306c2d3e69a8dca5ac6517c8e57883faf02aec871c7aa1f1348d13ff1900a3
 DIST gnome-settings-daemon-44.0.tar.xz 1464004 BLAKE2B 2c32dbea04f2d5107eab934379f955393590aa1ce2a4b27368d4df493fc96a07c0b21942a3a8987f85dfff4c6945e455c9113c1250c8fde3559ade43f81989d9 SHA512 276d1c2e559e0297855cfc9fc7bd2ce4ae55e2b711222f1f1aae4802dc6499f51ea09bff8f44c5d7b9f0f5a32ab187c2ac4d8ee8e5f1754a186ac189b4e885da
+DIST gnome-settings-daemon-44.1.tar.xz 1458612 BLAKE2B 86a66087c899c583a3ff77f1268d83af6ebc6e703cc31c76d21fcc3482ad2e54cf46c07af27f79126b26c0720eb1ecbaaf65c9a13b5a04edeb0145188881a4f7 SHA512 a955d74a594d49f67a5c27ac60d6f1e9b4aba7b12cbd0af8d3be02c4b2e8385f1abfbe08b62177b69851e9202960a17429373bf5533adbd73699232fefea6c79
 EBUILD gnome-settings-daemon-43.0.ebuild 3541 BLAKE2B 84760b8c1226724569c53fb4e3f58462a93a09ffbe2479ee3cec2ba7abf5a6d97e3b8abd2c5f3726ccc31a41d5e230ecc18ac19f230b88459a53b4ecf3af4b8a SHA512 4289eade4976677b912ba357b6a7be0d5855a3045eb58ccbba273cb03182354732765b91a9b9844d1e8926cd083461dea8f0b90ca4cdb4d6eb9d891e0424aad7
 EBUILD gnome-settings-daemon-44.0.ebuild 3544 BLAKE2B 7ad60b440bb6e100ad204fd5c69130b9360a50d082a61eb16520e46b7a6bdbc7e883c9d41b862f497a51ca8734a613f5275621bf9d91949a381985eeb058eda7 SHA512 6a84a5ca8916a8e1e59f628979e8b77c6884054b3c65767533e03285a893a95667b17077d378181960ca8515812f07cf51912857ca6a7903fd51ea5a031c8bf2
+EBUILD gnome-settings-daemon-44.1.ebuild 3515 BLAKE2B fb5fc458cc43b287950eef18b2d440eac4fc7bed7d6e8d5a44108bde92ed4a4751aab659757985ebacbe59e7cd8bd4f158adcfb9dae04060ce9b898c35c03847 SHA512 54c3ab50a75cc5d35e0490d27e461c599679be672e651611660439f3eb77f21793be59f94c2cce9f9bd07ebfd1f510e754bbeb29f659a3e9f623cb26f5775538
 MISC metadata.xml 663 BLAKE2B 27a0e4135576aeea4c6b962c90d894df06f92b3b015fab78246724ce7ca2f985cfde730f1f9c91f0cc01733f274c0225816e24fac2fca40c585b1a8667fd7d4d SHA512 e21c9dc181f13228662a2a91d7d8e0fedc6270f818a79308e270c9de788011379c155e835534ebb5dbd5f3b07a9e83ec618d9d85f81f46784007b380c6a7ef18
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-44.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-44.1.ebuild
new file mode 100644
index 000000000000..006297788deb
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-44.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+	>=sci-geosciences/geocode-glib-3.10:2
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/gnome-desktop-3.37.1:3=
+	>=gnome-base/gsettings-desktop-schemas-42
+	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
+	>=dev-libs/libgweather-4.2.0:4=
+	colord? ( >=x11-misc/colord-1.4.5:= )
+	media-libs/libcanberra[gtk3]
+	>=app-misc/geoclue-2.3.1:2.0
+	>=x11-libs/libnotify-0.7.3
+	>=media-sound/pulseaudio-12.99.3[glib]
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99.12:=
+	x11-libs/libX11
+	>=x11-libs/libXfixes-6.0.0
+	dev-libs/libgudev:=
+	wayland? ( dev-libs/wayland )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7:=
+		>=x11-libs/pango-1.20.0
+		x11-libs/gdk-pixbuf:2
+	)
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	modemmanager? (
+		>=app-crypt/gcr-3.90.0:4=
+		>=net-misc/modemmanager-1.0:=
+	)
+	networkmanager? ( >=net-misc/networkmanager-1.0 )
+	media-libs/alsa-lib
+	x11-libs/libXi
+	x11-libs/libXext
+	media-libs/fontconfig
+	systemd? (
+		>=sys-apps/systemd-243
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+# logind needed for power and session management, bug #464944
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	elogind? ( sys-auth/elogind )
+"
+# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
+BDEPEND="
+	sys-kernel/linux-headers
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		gnome-base/gnome-session
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
+	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		#-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
+		-Dudev_dir="$(get_udevdir)"
+		$(meson_use systemd)
+		-Dalsa=true
+		-Dgudev=true
+		-Dgcr3=false
+		$(meson_use colord)
+		$(meson_use cups)
+		$(meson_use networkmanager network_manager)
+		-Drfkill=true
+		$(meson_use smartcard)
+		$(meson_use input_devices_wacom wacom)
+		$(meson_use wayland)
+		$(meson_use modemmanager wwan)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# Don't auto-suspend by default on AC power
+	insinto /usr/share/glib-2.0/schemas
+	doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 708a4ce7d42c..9028c5bdbc25 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-firmware/Manifest b/gnome-extra/gnome-firmware/Manifest
index 78955c0b4c13..5cd32ec8869b 100644
--- a/gnome-extra/gnome-firmware/Manifest
+++ b/gnome-extra/gnome-firmware/Manifest
@@ -2,5 +2,5 @@ AUX gnome-firmware-43.0-build-failure.patch 779 BLAKE2B 91ea030a1787dc9f55e20f9c
 DIST gnome-firmware-43.0.tar.xz 261244 BLAKE2B 93eaf911d080f70d9f7de0467804751fe9f26fbe7d9aa0835360949bcc8c7ecb827ecc1a21c71392448b98b442db239ac85181bd1bfeedd896ff7357ebfee206 SHA512 8aa06de07e5fb40f15ee8c8a688552978dd183db8f783246094d5713c99d8b90aeb50212517a45e80e3152053fed864f99028f1f2b8535dc596c86a7d70c339a
 DIST gnome-firmware-43.2.tar.xz 272344 BLAKE2B 6fc698d3b8c831d4802111bc5bfd290f570a1a87ca621280621e191c9669b892732ed63b8dac516fd7231092b777977844f06848c32ea67a9ff6338166330f25 SHA512 8524a2b2c5ab5de5f2cbb01e02e158d351e29182af6330c34760745fdd2817323ac11eaad302a540dfe16d29aef10778c38bb705523d8260340d06188b98fc4d
 EBUILD gnome-firmware-43.0.ebuild 991 BLAKE2B b8582d4edf80c4e893e52a2fa806d160e03b5e673ec29471c219e3e6a2237cc6fa4dd30a9aa701cd5adb8a1c6b0b9be57aa298ce504bcace07d95dba6b98d68a SHA512 40fbd827b3644cd411e18c07eb322765baf2dcc4fe1700d981ee61f10f59b5cad3a90e52820fffd969a84c835e12a4f8771e64bb1d1d5a7d0d57919cf59a40d5
-EBUILD gnome-firmware-43.2.ebuild 878 BLAKE2B 28fba2880d333a29bb46cf212c8e5aee96abfc892e7cb92d176578e81fd7ca248d20634e3c63c7ac9f2d3fe0acdc5601327df8f3f849b85c942500b1f227f8fd SHA512 bc004e945daf6ddb440079323e1e7e8e540df0b8933f8f689a69136add0928e3a61ca0dc9f33bae9db3feac3b5d5adc8330e7523904b2eebeab9f2dfddb76da0
+EBUILD gnome-firmware-43.2.ebuild 877 BLAKE2B dda1ab3f73f616b95e83f96b6a116d8aa90006b81b1708507b87ca3f416b9e999d4f2b210db35eb1a5cce3cae466607a97889aa8a2d11803c272123e9f480300 SHA512 b1ebc94345732b145b21340daa615b94c718149ec01337bb5041228858bc7fbb54341176ff3cfbbf30e2f2a56e0ac0e2ca987dcc59e9cadbb8dd2fb1964e6edd
 MISC metadata.xml 308 BLAKE2B f69a25d724c2f5253d493aae71bb273f24995048771dc8cf8c6ad3f1625d569e64ab45c37355c6c506f4bc1a738d84982705952ae70cce916e41b1ef61536881 SHA512 ee2b486d1e31d6850051e69da213449f994373622e8b05b3091de3b8da19dd292503e2d3a919ccf705245ae91d883ff9cfd5715ad0da66d093a49959b26ffb49
diff --git a/gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild b/gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild
index 818a90dcadbf..362c504eab4c 100644
--- a/gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild
+++ b/gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+man elogind systemd"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index f6d3847050f6..4ffe2c63409c 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-shell-extension-applications-overview-tooltip-16.tar.gz 25392 BLAKE2B a66205d3d03c86d3d087948f3631c35dc57c0fc5d879a155289d0c5f48b681fa0d3fba9e5dcc863c33b9186f8ee07852e760418fa39a54f266eb38dc1df45885 SHA512 11ba9c12f86cae5f87ee4af16dbc2b32a284e7327da79ffd9ddaf009f451f0870a3689568d555b201afb3817229f722f76e318b3bec01ee415d156db1395dda9
+EBUILD gnome-shell-extension-applications-overview-tooltip-16-r1.ebuild 1300 BLAKE2B f484945db6a567ed57bd873a9ab1dc7ca36bf0246799c77e8e5207ae7839a1c317cff351ec6ece385bbf6f21f22aea23d581ad0e0d2b811b31a84078a16e9926 SHA512 e6e68cb54c977b73bab2b22408e15c852cf299719bccfdfecc492d9177d4637c60f0ffa23b140d2fb033a56bf0133e64b73e5a610bde2a5b28f78368b161bce4
 EBUILD gnome-shell-extension-applications-overview-tooltip-16.ebuild 1148 BLAKE2B 77d87558041e1337fa12a213744818797b02c2f42386ccea5c529409bcaf92c9bb5be2503332e97347c2b3a3a57e4575cd14e9d3ae39283c2672cc155d7a62a2 SHA512 5fa881869449d38d3ceb22e710d3f76c8d1cd0be6ea00a74b53d7f9c76bb50ecd4304aab4df4ac33507f01fe7b89d9b35a5647a851c60a1347dd7799e2496a14
 MISC metadata.xml 349 BLAKE2B 9210c6b5ec395569daf09b4d7328ae05f1970050a258eca746efbfc87b4020e7fcdb6c848465a1668f7cd2406b7aa78d70aa072eedbddd79a392a25bea4829d6 SHA512 27f439e918821e6fd70e29c0227e6b33b8c3bcf7e5534d191827596a085d77e92ab6ae94e63fc5ffe2c8c427a02b686d4611e31e352b578dd9bf76f7b5de1261
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-16-r1.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-16-r1.ebuild
new file mode 100644
index 000000000000..5b6b473b9deb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-16-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Show tooltip with full name and description"
+HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
+SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/${P/gnome-shell-extension-}"
+extension_uuid="applications-overview-tooltip@RaphaelRochet"
+
+src_prepare() {
+	default
+	# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/29
+	sed -i -e 's/"43"/"43", "44"/' metadata.json
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md schemas || die
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index b7695a6679bc..ce32c09f53cc 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -2,5 +2,5 @@ AUX gnome-shell-extension-bing-wallpaper-44-unlock-screen.patch 1792 BLAKE2B 725
 DIST gnome-shell-extension-bing-wallpaper-44.tar.gz 6821608 BLAKE2B ddc29bee60cbf457eb853ad8d0caa1c9e0660782d021fda03e4eaf2f2d50ec72cdafe225ebfe57abbb1ac8d506ff409d84c74c629765e176ff35991ef52d04dd SHA512 8402862affeca913aaf67ee771df3152309a23335e99cd6c2fc7c6f0b293f8fa4e593fc2c9a4e1366e340ab956d2ee623780bc02654dbbff46b00b30232a70dc
 DIST gnome-shell-extension-bing-wallpaper-45.tar.gz 5410536 BLAKE2B bf0a8c7ae8fc421ba9a9cd88cf689b18336c3e25e0eb5627e600e4d8e2fb0ace1c7b867e189aef8fa2e3f2a7cc2e7164636e712a4ad0e6cf3b54b4c9428a96d8 SHA512 e82bb69745f06c83d76a7faad0c777b7b77b69b39a31cf7845593c861b45cb571a5183423efbbf05cfdb0e2b43f205160e903de65d545d98df0ccd43710b00de
 EBUILD gnome-shell-extension-bing-wallpaper-44.ebuild 1230 BLAKE2B 5d38a34ca80f625166eceecf6e6fbda2fab3e3098a582bc8e7f91d79ec7c330607f4fec4128f75bb2d6c1239a112ae0028056f9a9de9e7db19087858c5c89fa9 SHA512 0ee00d2aa1276621ec156132df768429b8f96ccb48f6bc3548de73e3b59e1d613ee8189430dbc627ba362872ffc0685d4dc21f5cc06743b59a0683f50a980827
-EBUILD gnome-shell-extension-bing-wallpaper-45.ebuild 1232 BLAKE2B 776d99d16bb57d58ed039585eface3a31e846c0152a5b976c6f9efcd3b261cabf5fb73488805c7414c3d19d70fea19c13794fe36f0e3bdfed36dd7a9eff02b21 SHA512 2724c8243aa7fe9142e181ebca8d745b07d617866ed6d954a32d05661cba22aba4a863ec617b8a1207f6f33cac21d227274746cb84d397fd1c5784735cc171bc
+EBUILD gnome-shell-extension-bing-wallpaper-45.ebuild 1230 BLAKE2B 5d38a34ca80f625166eceecf6e6fbda2fab3e3098a582bc8e7f91d79ec7c330607f4fec4128f75bb2d6c1239a112ae0028056f9a9de9e7db19087858c5c89fa9 SHA512 0ee00d2aa1276621ec156132df768429b8f96ccb48f6bc3548de73e3b59e1d613ee8189430dbc627ba362872ffc0685d4dc21f5cc06743b59a0683f50a980827
 MISC metadata.xml 342 BLAKE2B f3aa4b5dd837d17ffa18858458dca8975bb3aa5b6a36d02c1a342f09709b099ec7153acf451f2eb5a6d14b8e08fbf968802400732cb676ef180a33556bc64dd7 SHA512 9bd667e6b952503bc1ff8f61a22f7113f373d0a221ee372a212a5318d34957bb6b14b57153bec655e0f5fd7f67b4a9c1ba463ac95abbe307e5f3a765373931f2
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild
index c449d1c4f90f..73b698e6abd2 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index a02662f703b7..3ea491fe42be 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-bluetooth-quick-connect-30.tar.gz 23135 BLAKE2B e75d71980951e9e41512b83ce3ba86f91572e0c346b69bf79bbcb783bef75dbc8a76ae0a86307328bfbd5cf0f05bd98ac9272d06e38a54a591c277ae6e12e586 SHA512 15bfdc26535f997f82a428d46c808c04e619ae0f04aeaaf260c88a238e51f250ec4e66723fa58ed30992cd9a24304e056a88c3d4af3e8effee5700aa83edde98
 DIST gnome-shell-extension-bluetooth-quick-connect-33.tar.gz 26460 BLAKE2B fac17c01c0498420f6b3f35d770c5272112577be8001174b4781640e7e2e91c71e14373cb662a4c92539ebb724dda0986b96bb1fc78d4c5770a458f5898afcb2 SHA512 3642c09c9975f38b11dd8605cfce2030bb8aa5921c6cd55957cc8061cf670ff94af2f650745a891bdb491cfc768fe93da948518dc99c07d531e27e29adcece87
-EBUILD gnome-shell-extension-bluetooth-quick-connect-30.ebuild 1243 BLAKE2B 50870a61acc9a684aead504b1e9278fe288f1545844a587e4dbfea19e617949c55872828301d2a0cbb1f7e2f98f1eaf244569dee248ffd570a1f84fe09dde776 SHA512 f0687ff3eeeeeed9c3c6496cdc1a544b72df06daa4b875e577d72d6d7d546cd3894cce822ce2810be22f5e2cb7b18acf991c45f9a18d3fe3d26ef823d9f8cbc5
-EBUILD gnome-shell-extension-bluetooth-quick-connect-33.ebuild 1245 BLAKE2B b5289a98660cab664046bcbcf98e1fe0f6bf1e834f1a1f1552fb9a5b10599e397ad821f6524af70925bfdaefce84f0942a24d84f6719e606ea707e5c17dc557f SHA512 5d6128cdb1fa76e7d8c2f6aedd171295ca182a0afce3438a72b8be39cd4eb00d8a2183c7d1f9418268cc38bbb48f38d8c7f99d06c32a7229608d8f6304cd87ab
+EBUILD gnome-shell-extension-bluetooth-quick-connect-33.ebuild 1243 BLAKE2B 128699c0a29c84d3d6113b7cf1f1550f1948cafa23af7ecedd403b150ed4485980d9fff3bc958a249dbc635bf34c334f3cf41972b1f51d00ca3edaf35060c20c SHA512 1771b8233909548e3ec1a5a935aa2def8ff4c58a6130bd58b070151255afee871465110d7d478e677f6eb5b0dbf381377b877e2d4b15e38ed4997384205dcd10
 MISC metadata.xml 344 BLAKE2B 371fc8b073c1b6c3254f51507aaeb1e3fdbddfb4ecb709ae14f9b92c45c0c4c2a7283ffea334b64208b392b403b142fb1b6f1ca2c4293dd5f0f454ac1fd5a6a9 SHA512 2dc5af06e39adf16ac2cd7599c3bf62551c786589f781c9e06cac008729d9a82e8e8528f35c3c12a9245431a702f7716eace963da97e3a8b5ad2c3ec23ca1cb5
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-30.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-30.ebuild
deleted file mode 100644
index e19b94a25c9c..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-30.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
-HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
-SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	net-wireless/bluez
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/shell-extension-}"
-extension_uuid="bluetooth-quick-connect@bjarosze.gmail.com"
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE Makefile schemas || die
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/"${extension_uuid}"/schemas
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild
index de6cf4b9945f..234e18e5fc7f 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index d5a613aa8aef..9f17266b3524 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,9 +1,7 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 DIST gnome-shell-extension-dash-to-panel-52.tar.gz 21167738 BLAKE2B d3a53daf218f9c9e5eebdaa94c86e31d2eff54ec46ea1d31d31967f431b3d40f5a5349e9d8d9ea4cc31a780cd4683a25edfaf2917f4754c3ded291ee1655208a SHA512 be7b650c7cc2d91fe1dd5d58165fc485e3d19112821529ab4ed34bb2c957e9b14199eab3dbc372c54d1726fc8fa44053f8288b18849629066c2f4094255ed0ac
-DIST gnome-shell-extension-dash-to-panel-55.tar.gz 21206159 BLAKE2B 76a3f0b9ba90b84ff175f48d0896cb5e0db55bcac242a8581801bae0a755be98384408a3c55d0057121d1bd97df3006a7c3c5ca7fd615fd623ca69f794bb5750 SHA512 a3aa47c6c881a2adc1498a84b1592e0d4b0782bfbc59e9d1a08916ccc75304625d875c3ba59908a2bcacd386941ec3ffe9d0c4f842d77b85b4073e327b6803c0
 DIST gnome-shell-extension-dash-to-panel-56.tar.gz 21206272 BLAKE2B 31ce957b1cc7e57b9c10c1f092a5b8a20b8b9aff2871954df48de584fd42e079cabfc3cf17f25d29f90d8551a3ae4ddc4dad1047659be408133ca0f459edadca SHA512 f11da73e72bb5199e55067dc581c019624db301947460861e56b50488b8da0151a71e82676f03f9283d2931dc15e23b0e7c0a149310951757d21983b216db2e5
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-52.ebuild 1831 BLAKE2B b95e33936528d9d09abf6de9830e0c57e6abae252a9f264c657850d9987203c82342a33072cda794f159bcecfb9865792feb0e25c5747f7b2d00bb07ee160f21 SHA512 9e22c63ee872b4fcf2a59c0960f03524d4fef6a6a893515b4bed1487dab40513733c596406def66cfa335bb32b451da46206d754fe6982a2de068e9684077c3d
-EBUILD gnome-shell-extension-dash-to-panel-55.ebuild 1833 BLAKE2B bb43238ffd0401f579ea3e33f8203a9000f7e76d84374621d9ab96dbcc60dfce49942b5812a152f6ad344a1c92c124a7e4fee8a2d1db8a7267af62f637d2d64d SHA512 ade42aad71c405515c0aa76d8559dfcf6c05ba0027a61ecbf6f9c9e90aea0ec212043456d59e1f2b3f75984534eeeab271df3fcbe4ff0217cc2fc6cda1ff5eb2
 EBUILD gnome-shell-extension-dash-to-panel-56.ebuild 1833 BLAKE2B bb43238ffd0401f579ea3e33f8203a9000f7e76d84374621d9ab96dbcc60dfce49942b5812a152f6ad344a1c92c124a7e4fee8a2d1db8a7267af62f637d2d64d SHA512 ade42aad71c405515c0aa76d8559dfcf6c05ba0027a61ecbf6f9c9e90aea0ec212043456d59e1f2b3f75984534eeeab271df3fcbe4ff0217cc2fc6cda1ff5eb2
 MISC metadata.xml 336 BLAKE2B d0b9e1e54d819e1ab592743b8d8e169cd974964ca09568efac39a9b88b0389faa776aadd3b7c1e9b216b1a7be2c548ab43579539e993fce4f7e82e24f7076d47 SHA512 32696977b4ad41aa0b44f56f679480b90d4c0565e2b4ca774ead9d2f72a694f196dd3b51b3b1bb99ca36e9cb24418e4f41d9fa382a8a0638a6b6cfeb837b1d6c
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-55.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-55.ebuild
deleted file mode 100644
index e52e3ff25663..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-55.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-42
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index b0a66b8f9cc6..0382864a9ddf 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,3 +1,5 @@
 DIST ding-47.tar.xz 137520 BLAKE2B afadc7db89024104bddc3ca6842552482db9e011d5d562f47ecabcffd6593d467a5ed248a494000688eced97c0931e4b8964eb8eee23aac8c234531e3a257a92 SHA512 1e9d1ee1d214ce62dded6c6bd42ff1f2ffc08f777f5a569bf84cfb775d55933d908289c9d23325ff227fc08a2b47c2fc3be6434d48fb8230ffb6f39b25cd7ec7
+DIST gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2 149883 BLAKE2B 9097ea9489ea220297082e487bd846dfe0b7d2188fc878bb4927e92ddc8aabe21ee2b4acfad91b95694713b90c3c99c82eae2f184bd985228cbe2f7f5c61aaf7 SHA512 220a2c4337f47d196d81cb21df80e1d5cd34778f3f14cf33f51baeb6156309244977acb9d5981e588ed68060b7c47c2d567f6ba5f835c2af4a537bd70a87daa2
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild 992 BLAKE2B 618c284be474adf123040062d5104b6369189bb1ca75ef4e3f6b488ace07761059cb77105c1b691cb9c3a0a255bb817f29b3c6bb10751adb3fff0db430408c4c SHA512 4a3680f057ae837b25e9839d6ce3c99006a09bf408a67259a5d56871fa347eb45d57df013def45318ab2954d4241a654d6ddd52da2fab5ac4eb5ceb287acd76b
 EBUILD gnome-shell-extension-desktop-icons-ng-47.ebuild 1001 BLAKE2B 3b684a28652088b5619b00193a7c983b19dd3dd8b4eec9729dfe6700a5edbd1fcc56df2b3ffd8da45330392d77517743573d6ba6628b027193d78a1a804b861a SHA512 c8161652735d9bddc54fd09ed073919ee09337f0d4171fa3ad77e386667e801564c02877ce487a99a6d72ec1b32d908c1cfe94130510603a3b9ed6e8faf07ea8
 MISC metadata.xml 333 BLAKE2B 3bc225ba5cd8ccbe497b7f1494e7ee2ebb8d43a59756dfbc5a6152a1fdb0027f02e1057f6b1bfa6fe8d97b4a2583611b45e0d27bfb37a1a5563246d411eb057d SHA512 f835b8b301a79f5bc650c75cfc0c52eb0ddba2266c04c559f2651fa429d1747af98ea0b8e7775ff3df6d5d8b7ee545f22a89d092138fc91e19fcd0d5e325f315
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
new file mode 100644
index 000000000000..092c49db2cec
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils meson
+
+MY_PN="desktop-icons-ng"
+MY_P="${MY_PN}-${PV}"
+COMMIT="9c2f2bc688e9c95335c64f1b3a6ad0cc2051d7b4"
+
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}-${COMMIT}"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
index b9282233ccb0..5977575cb462 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-shell-extension-weather-in-the-clock-20221024.tar.gz 127100 BLAKE2B daf0feb6730351c35bc0c66e54a39df78095eb284774c1689ffe7918afee329e1ab32a54657635ba6758f25fdee0de6d1ec39e007653925da87b3f967a1c4934 SHA512 7ebc1c7368b6e07e9186a3b2a19ee4aaedb0f897b31ad37d33153d58e961dfb9b6249bac287aa51fb110ad28c4858739b7ebc7a82a1301971f3c95891591a417
+EBUILD gnome-shell-extension-weather-in-the-clock-20221024-r1.ebuild 1276 BLAKE2B 09191f086f46f80747332076ace1a126aad08a4074ed73525df9a730fca732ae58c075f18ddeab9bf3916a658d55bd2befedd43bb3835dae6cf1aebfc913fc08 SHA512 fadb452563a4537484492df52a4683e93370e7490fa4585dfbf67ed1cb57da6d9d3d163b9a2548ef58531e6dabdb304f56c802973f998ede6c898eca59feb915
 EBUILD gnome-shell-extension-weather-in-the-clock-20221024.ebuild 1082 BLAKE2B b03d1aedb0f3c7b5ed56f334626def372be828e9676cef0bbe145cd6275526bad2adcaa289bcea9c1a0bde77ce396c179afa6b991b8a79384442372e458e7f33 SHA512 6c6974850d32370ae7d0f96388c2273e969b800ce60205837e1ebdb674ccad73d61166c1fa13acd8f168d82a206e0a91fafd55e55c74abe5696352c84fdd220d
 MISC metadata.xml 317 BLAKE2B ed39479ce5dd8dacc6091575826c37509f00e28cd3a59ea7147e09e142d263ce5e3b27e7e74995ba0fd4a7559f9e47b96ab64a39114c079d87e80b9d0fd3d7cf SHA512 a04383c0ba503df6fd72aac11a833baea2a175d449b9f5b64a2b6a709fe52ef46210e37870b77cb36efb4e30506ddb9ebe5d831bd5f209f241bbff59ba3e4fa3
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20221024-r1.ebuild b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20221024-r1.ebuild
new file mode 100644
index 000000000000..d3210bf84483
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20221024-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Display the current weather in the clock"
+HOMEPAGE="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock"
+COMMIT="38ba36090961a37260215ae04f4a7e0a1377da95"
+SRC_URI="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	gnome-extra/gnome-weather
+"
+DEPEND=""
+BDEPEND=""
+
+extension_uuid="weatherintheclock@JasonLG1979.github.io"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	# https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/issues/30
+	sed -i -e 's/"43"/"43", "44"/' \
+		"${extension_uuid}"/metadata.json || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/gnome-shell/extensions/
+	doins -r "${extension_uuid}"
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index c622e3cb0770..5dacdcf355fa 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,5 @@
-DIST pch-session-42.0.tar.bz2 3610664 BLAKE2B c14529dd7be8854e4d24b4b4c3335c44ebd714b4dcd8ada8bf6e8da6236d962c57fb537b4a651118e8f719b7da87141a8c1512bf6a360c7998f23384ed06b14c SHA512 63a73a753cc95dc8e152a4d535674d420861e87a57a9c47b1063b9bdad410ad4c93e2ed2a5e547fae75f9e76b0f640ffc8d0f3116195afbaa18e6a2fdb9c5ae7
 DIST pch-session-43.2.tar.bz2 3610733 BLAKE2B b7439af088ce6483ac6a92a9d0ec434d6709496da5bdabb35ac95f7c71d2544866c2fb8e1675b06b6a9274f523c8b763f2de317d7b89a5a4f14e69404f9d273a SHA512 906d0f628eb4435876672e124c110688dc495cc263ef30b8a62661fe38f345fc3e0e262c2dffbb34c7d3adfacc103d4a0c5311cf43df8a7619efc15f99385092
-EBUILD pch-session-42.0-r1.ebuild 1694 BLAKE2B 2c1970b22977f3cd8ad1e536834a3506f21e6970b62ce5090a46c68445522cfb25ef61aa5f4f3ee6e3e4a26aa4cb5eb3be8f4fb315854cdc6f805e16dfddf6cb SHA512 6ea717f58078511e5500523b84b478d672071561c4bdf034d606c00735c179a5bb36d92b1b3490295661c605759145e214f3ea1a5e6171d7900f0285dcb038aa
-EBUILD pch-session-43.2-r1.ebuild 1647 BLAKE2B 6a462f6b5f0a3e63a98c226f27c251f53692daf29822c7945b61cb24d63fa237b6b3d82528854f70827b38d1066d0a625324d8576acbdb4ed799441ce1ee6f30 SHA512 538206bc5ff18fc68e715a607372972dd1133101c0e06891b9bc1bc24cf1e3a5335f345cb9452f871fe2681fe300b5744afebbb690dce0a00e9a6730e4ad030b
+DIST pch-session-44.0.tar.bz2 3610775 BLAKE2B 4e13ca6492fdcae7ff2edc2012f4a98181affb5a3b08352049a786eadc6b10d369d653d3cd790f119ed2737fa72fa5d0233998a6ee91692dd04658e9c36c559d SHA512 1db395fb43329db1824ec5e6cccb83697b30da214fec132569661d392c409d0606cab9b18d58d0c2f0803ea2351ec56596f8d20782c0a3b392aa570ec9a10902
+EBUILD pch-session-43.2-r1.ebuild 1646 BLAKE2B ef27da50a00982fbb6e4806f6e07b81bdd4cd08f28fde882f7ec9889a456f8d7378d91d8dc944918a2d1c510d62d4d3357edaca7b4c12ee75abd788d7aced34a SHA512 45a30333e79dbd4164b91412e0764f17d90fadb021d40832969d899c28a33f5a7b35c7b69d9b149ef285bd9697e43f74c4df5121dda9a584ceae02d3cc7011c2
+EBUILD pch-session-44.0.ebuild 1391 BLAKE2B f6b5ab1f62aee23a47da3ecf75a556e5bcf39bbd8ae2111b8a6765ed72a78c52e3d9387a931676affe85d36e5df6e2b7eea086e7eec5fea45239ecb3085ca3cd SHA512 27bcc62d3cfd418e4a9d4a2eadfe2df5c89627cb353f0f297d75e063237f92b0a1f7f5cee2c68ae37eac8fcfb083bd59618668a1703016d7bd6f4ebdeaaf94c3
 MISC metadata.xml 328 BLAKE2B fc1db6815e16cdd4fb7afd93ad411ad45b83b21f89c95cd0dbaf3c82d85f3d2359b5d276615e0baf4978d788538186a4a1e5c0275f735a9db490f644c48827fe SHA512 07bdeb40d124da2fb287c310b0cc022cfdfa83ffc4732f6c1be9418efda05d593131b7533d8b16fd31d8b2f7e1e55a6e91ba7de62145f19d6469e094fe35bd94
diff --git a/gnome-extra/pch-session/pch-session-42.0-r1.ebuild b/gnome-extra/pch-session/pch-session-42.0-r1.ebuild
deleted file mode 100644
index 1d7b0626e89b..000000000000
--- a/gnome-extra/pch-session/pch-session-42.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth qt5 webp"
-
-RDEPEND="
-	>=gnome-base/gnome-shell-42
-	>=gnome-extra/gnome-shell-extensions-42
-	>=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
-	>=gnome-extra/gnome-shell-extension-appindicator-42
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-40
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-47
-	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-50
-	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1
-	>=gnome-extra/gnome-tweaks-40.10
-
-	gnome-extra/gnome-clocks
-	>=media-fonts/fonts-meta-2
-
-	bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 )
-	qt5? ( x11-themes/adwaita-qt )
-	webp? ( gui-libs/gdk-pixbuf-loader-webp )
-"
-BDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	default
-	if ! use bluetooth; then
-		sed -i -e \
-			's:"bluetooth-quick-connect@bjarosze.gmail.com",::g' \
-			usr/share/gnome-shell/modes/pch*.json || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/pch-session/pch-session-43.2-r1.ebuild b/gnome-extra/pch-session/pch-session-43.2-r1.ebuild
index 56c86753e8e6..3c4f4f05b5db 100644
--- a/gnome-extra/pch-session/pch-session-43.2-r1.ebuild
+++ b/gnome-extra/pch-session/pch-session-43.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth qt5 webp"
 
 RDEPEND="
diff --git a/gnome-extra/pch-session/pch-session-44.0.ebuild b/gnome-extra/pch-session/pch-session-44.0.ebuild
new file mode 100644
index 000000000000..bc5c1be9f513
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-44.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils
+
+DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
+HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
+SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5 webp"
+
+RDEPEND="
+	>=gnome-base/gnome-shell-44
+	>=gnome-extra/gnome-shell-extensions-44
+	>=gnome-extra/gnome-shell-extension-alphabetical-grid-29.0
+	>=gnome-extra/gnome-shell-extension-appindicator-53
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-45
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-56
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2
+	>=gnome-extra/gnome-shell-extension-gsconnect-55
+	>=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1
+	>=gnome-extra/gnome-tweaks-40.10
+
+	>=gnome-extra/gnome-clocks-44.0
+	>=media-fonts/fonts-meta-2
+	x11-themes/papirus-icon-theme
+
+	qt5? ( x11-themes/adwaita-qt )
+	webp? ( gui-libs/gdk-pixbuf-loader-webp )
+"
+BDEPEND=""
+DEPEND=""
+
+pkg_preinst() {
+	gnome2_schemas_update
+}
+
+src_install() {
+	insinto /usr
+	doins -r usr/.
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index e9a4089d39a1..40dcd786fadb 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index c5a7cebfcf75..103d1f0302ba 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,4 +1,3 @@
-AUX systemd-0.9.17.patch 1090 BLAKE2B 7f4ef47739555d20b85ead7cdf8d72d7475f480aab8193ce447a55bf4a5b36f14d04cd05481bf9c9aaec82d2d7fb3e6216c94f028723e9b07721c090ab5b8be8 SHA512 8e415c3d68accce1da3e52df8e5b1ddf45638db86298f3be5a51cbe1107f7f2266327c5edeefade910cca5ab418381b2cee10c42086ca1e9b2ff744d06d6d1e7
 AUX waybar-0.9.17-gcc13.patch 808 BLAKE2B 21f746710d1db1d064f58f0c78da281ef9fd68ba16184cc255a7f557f2faec75d625462d833aec3ba2f3dc64c249bb6785a7791f7429d85f65e0050d102d43b1 SHA512 91edbb60aef10fad5259e73daec98baf026f85f38dc4a646cccf5cdccc438857de2f66ad9b1fb1f53e1e1aa4cc1db572609661e2b27e9f5e4773c326d2c2b9f9
 AUX waybar-0.9.17-wireplumber.patch 15607 BLAKE2B eb5ad8d86cf5881bcaa4bcde7baee10c0c0c6add3005c0e13dcc86fa0e6212d1e49900642edb8ddaff14ee1cfdf338c16e6b06e8c9a94309f0220c1a39dc5703 SHA512 1ab4da1c0f1c5c62a8054a7e7ce8c81141a15abc053fbff8c3d98e78d6934b6dcacd04d52841d0ea98fe7507298d33bf896f0a4ba3a55f4610aec0f9c8e3045b
 DIST waybar-0.9.16.tar.gz 215154 BLAKE2B c1e655dc57d3950472e22b23bd7bb7f96dd5daa1fc1ffee871a3677486f9f41981dbea8f559f8097e9c7bc367b0bcf224119af556ca62006f0e68e380b91fdec SHA512 d89067639de8ad560cd1515bb448f47f5994281b35239f069a2012165c0f83e0a3ae861cffbb93e7636d7d95cece9424e5900d40a06b80e71768aabda5f7b54a
diff --git a/gui-apps/waybar/files/systemd-0.9.17.patch b/gui-apps/waybar/files/systemd-0.9.17.patch
deleted file mode 100644
index 7d6c8dd10b38..000000000000
--- a/gui-apps/waybar/files/systemd-0.9.17.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/meson.build b/meson.build
-index ebf68d4..3c2a7fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -122,7 +122,6 @@ endif
- gtk_layer_shell = dependency('gtk-layer-shell-0',
-         required: get_option('gtk-layer-shell'),
-         fallback : ['gtk-layer-shell', 'gtk_layer_shell_dep'])
--systemd = dependency('systemd', required: get_option('systemd'))
- tz_dep = dependency('date',
-     required: false,
-     default_options : [ 'use_system_tzdb=true' ],
-@@ -136,16 +135,12 @@ conf_data.set('prefix', prefix)
- 
- add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'cpp')
- 
--if systemd.found()
--  user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
--
--  configure_file(
--    configuration: conf_data,
--    input: './resources/waybar.service.in',
--    output: '@BASENAME@',
--    install_dir: user_units_dir
--  )
--endif
-+configure_file(
-+  configuration: conf_data,
-+  input: './resources/waybar.service.in',
-+  output: '@BASENAME@',
-+  install_dir: '/usr/lib/systemd/user'
-+)
- 
- src_files = files(
-     'src/factory.cpp',
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 46d92ccc3941..0fd045a145da 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index b23dfe9e0085..db29177be39f 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -5,6 +5,6 @@ DIST extra-cmake-modules-5.102.0.tar.xz 330720 BLAKE2B 1f2036a3a9cf240afa822024d
 DIST extra-cmake-modules-5.104.0.tar.xz 330988 BLAKE2B 9092045fe525f42647d426231997765fd7170b7768408b560af2599231a5183ec02314422deca2b1354cdfa291e1b16e29d3a368e97365e421c3945d763427e8 SHA512 63a3c4d66a07d48bf0a9ebe4fd009b5e043baee42d8a3f58b286e2b825250de05b896aa7e9c06f543eb29a12dd16be7ef5fb773c06477195cf6f018877805014
 DIST extra-cmake-modules-5.105.0.tar.xz 330968 BLAKE2B 96ba9374e8cdf8cba016017a411f90e5faf3c5055ed4444eded3395dd586b3039f7e125ac2ccba0d20520f00ee8af642e094381d0ef71455b4269c17d1885146 SHA512 04de829d7b0d42eba010aad235d68cea7e0fc4970e5ca86bdf441630893887baefe20588ed8e2fbe5bcdd51cfc352e94192e642e7dac9932de8e8f99a1734ca1
 EBUILD extra-cmake-modules-5.102.0.ebuild 1843 BLAKE2B b2933a9332c598b23d2111464284a69e2d31b0aa6e5f8e15f5ad00319d6357aa87286fc1e220296022291939e531d01b40d74ddb786689a9414f29d449c785e0 SHA512 db0f077d4048816189ea9c66c96f96d02bfdfb1598851fcd2b378036ad7de740a1d99c196b7739c9dfcf8f97db883515a041342ea39115320315b415c580d40b
-EBUILD extra-cmake-modules-5.104.0.ebuild 1848 BLAKE2B 7d58e0a2cd4fdea3cdc0a4a87f245ea7b45bab483df1566796a024c11f9b61ea00c30087e10df3b1a5fd01901913624fad978445c432d02eb5d631bd870ea0de SHA512 1d50f3c6d04ffb9fdf1f6ccbd567cd733e7dfd6959a49cd15eb09d257a607e4cfa75949e58989835005bc1f2e603e90e16b7c8eaaa971424bb79c892da8fadf4
+EBUILD extra-cmake-modules-5.104.0.ebuild 1846 BLAKE2B 3b21d6f58a7d93ddf5a246dba95db12d48db9c1423427cd3d0a47ff4525f93b53f14191bbdf593555fb41f749f4606ecbd8b81e0794b7da6ed0680d59d97c515 SHA512 b9ea5a8301adc6be72b0ecac9594254adf6f29cb4d3d6164bfe63ebe24a8a8f19ef5fb74e78e4c63b7c5e8f35c9ab277051f1d3f35867129e10a781ba8a0cd45
 EBUILD extra-cmake-modules-5.105.0.ebuild 1848 BLAKE2B 7d58e0a2cd4fdea3cdc0a4a87f245ea7b45bab483df1566796a024c11f9b61ea00c30087e10df3b1a5fd01901913624fad978445c432d02eb5d631bd870ea0de SHA512 1d50f3c6d04ffb9fdf1f6ccbd567cd733e7dfd6959a49cd15eb09d257a607e4cfa75949e58989835005bc1f2e603e90e16b7c8eaaa971424bb79c892da8fadf4
 MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
index 4f1be6b93a0d..77f27bf769d1 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86"
 IUSE="doc test"
 
 RESTRICT="!test? ( test )"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 2cf0e6297a01..0160d23a0367 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 80eb1e5e5e8a..e6a845b15536 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,6 +1,7 @@
+AUX kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch 1264 BLAKE2B eb4b151f724470f369ba9c2b36c4910b1933739cd5e10c7163d9135b6dad99a2f6876e7738b38c0fd82dc0638e63f6a71da13d7ab64c3deda0caa9fabeaff809 SHA512 cb76b1f337f26458639caba52e6c4bd90cf92cda2f38cc8bac2e5415069d9d9604348ba609d36b2c81fc5f394f16c05c6b27e3ce2a78d5b5e5f7a8e38259ab90
 AUX kscreen-5.27.4-kcm-notify-changes-when-global-scale-changes.patch 1178 BLAKE2B a12f4a7a88c7fbeb9ea8a2fa32a2c720383e0e491de8a11b6ac48eb575cabf837b1f6cfc87fcf779e6d80b8efb5f262a65549e17cd3fd542a2ed046171e39e29 SHA512 45e2145b292982452dbf723338e0ac21b0c1d2402a31d227d28ce9bcf163e0917123faa7015d8a399c36d4d8aaa0a9b70e57206544b2b4fdc07dd12b6b4ade43
 DIST kscreen-5.26.5.tar.xz 154600 BLAKE2B 202f7ec24b01ca057a5e52b796176e6ae09518693cb50e16b0d3901351fba58d5554d959f4afa48b5539981870e02f14bde8c25402d4c2b6427acf5c896ca75f SHA512 58635bc2c5cb3e3cee6b838ddc3a9068c9b22bcedef6ddd9c4b6aa59889b59242118227e706208c17c89241a701f850d42e9c5617d876068367246d35d1800c2
 DIST kscreen-5.27.4.tar.xz 184212 BLAKE2B f0ff9a98f0d6151e230dbc1f4ba33d123b80d4d3879de818adb5dbff0a50e09892fbee37c7cd96f31e1708aef43b0c9bbcdae2c6c13f81f5a80380ba8145d72c SHA512 2ce33a582e8315133de31c01fcd32ea02627dbbd00fa2a8c30ea8a9a082b12c36410d21bb74c4ef727fdbab0c7ae6d9ff6cc83597c249e6a5456d6e11b738518
 EBUILD kscreen-5.26.5.ebuild 1348 BLAKE2B f06076f8cedb330a598c9aeb630027949cbc0c99a0fe5023f337494365da903a24194f28edb7e7946a3088cec9e666fd226eb43695761f38826311eb4b8e08c0 SHA512 3a0088c16d2a7f1486744a871d87ed3a2db8a57d97cffd930a852b1024f0b0d0618c99b86b8e37b2f5f02971b063d4919faf044e5c3bbcb21824aa3d82cb71e3
-EBUILD kscreen-5.27.4-r1.ebuild 1452 BLAKE2B e6df7c74851be734acd854860ae1d116cedfcf922bd0184e00b4ea1c47fbc703adb3c6278ece716786487e0418ddb026c22ae96cfadd61a6437187ceb89a9d4b SHA512 68ea0b97144ad807c038737ebc3bd7c80eaeca848c7eb7877a17e250e0ee387b06b48380f74fa876b10c612a7521cdb85ad0d957d817f09a977f2df76c9fa8d9
+EBUILD kscreen-5.27.4-r2.ebuild 1544 BLAKE2B 3e5c8971aa56af921efbcaa8c7a124d681411a5c35a9c6b8a78934a3ba45fc527c36aa224e556c8611875300ae08af823433cdf3798ce775d6d89e18aba92f45 SHA512 2ed462ab7bf1681009dc0aa51a43614e1551addf72cafdb60edc876f4b13178837daba589e405a41d60a1fb1138714641e8d73be6d9ac5c8237b851af28144f9
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
new file mode 100644
index 000000000000..795773a679f6
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
@@ -0,0 +1,39 @@
+From 8af1cfac332f6f7c4e6db40c851dd5ac719236f1 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 17 Apr 2023 16:01:50 +0200
+Subject: [PATCH] don't stumble over nullptrs if outputs changed during saving
+
+exec() opens a nested eventloop that does event processing and may end
+up processing output changes when e.g. a screen is getting unplugged. as
+part of this our m_configHandler may get reset to null, so make sure the
+pointers are still valid after exec
+
+BUG: 466960
+
+
+(cherry picked from commit 0bfa16bd2b59ac9b2ce8112c06d86e5e29c69654)
+---
+ kcm/kcm.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
+index f292699c..931509eb 100644
+--- a/kcm/kcm.cpp
++++ b/kcm/kcm.cpp
+@@ -172,6 +172,13 @@ void KCMKScreen::doSave()
+     m_stopUpdatesFromBackend = true;
+     op->exec();
+ 
++    // exec() opens a nested eventloop that may have unset m_configHandler if (e.g.)
++    // outputs changed during saving. https://bugs.kde.org/show_bug.cgi?id=466960
++    if (!m_configHandler || !m_configHandler->config()) {
++        Q_EMIT errorOnSave();
++        return;
++    }
++
+     const auto updateInitialData = [this]() {
+         if (!m_configHandler || !m_configHandler->config()) {
+             return;
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
similarity index 87%
rename from kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild
rename to kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
index efbf3dea06d4..b462d1c4519b 100644
--- a/kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
@@ -48,4 +48,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
 
-PATCHES=( "${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" ) # KDE-bug 468203
+PATCHES=(
+	"${FILESDIR}/${P}-kcm-notify-changes-when-global-scale-changes.patch" # KDE-bug 468203
+	"${FILESDIR}/${P}-avoid-nullptrs-if-outputs-changed-during-saving.patch" # KDE-bug 466960
+)
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index d8d684ed6ae6..b57709e812c0 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,6 +1,7 @@
+AUX libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch 726 BLAKE2B bb44e67305f109d3dbe2c74286b3dcba805a781756c33cf8c6130891c2f3ad1e2aeedaac2dfe4833823c68fee64c96c6516497ae11ebcad9dc8a9af3debf4a39 SHA512 1742d9eac14b6713565e70557499149c8f1b22de7d85488fd23d7a3a25109ce1b0663875e4a0823fcc1364304e88d61e8cb9545f5a9db3b94ff311cdd79e0e2f
 AUX libkscreen-5.27.4-clear-edid.patch 1199 BLAKE2B 5323d5314ebd8b37368564a4b936981dc3597bc1a3e85ccee619ae9f92c109b48820225f8e03a0f6aa54fb7074629affb9913edfd502b7daf50afc1c85b47084 SHA512 84c4492731d85e0c642f3ab3c42dc6edb632c9db9214ac480afd1169c28379f243a2aee8fc9603ffeda5fcd8911d33683c3db54b8f115160372878cd3dcb8f47
 DIST libkscreen-5.26.5.tar.xz 106028 BLAKE2B 67601a61a7fdb41c42b3840de29de295482eed942e3ae17a044d29a53821ebb7f5e831ca01c246d8a3f720a27d14d0580203979c5e73e3c624a416cfce458f0b SHA512 a67d1c3a9671380ff1fd0549819a599ac65f9654940a9c18b0695b070eccb9ac153e0ab81ba32e4786913fed8c64ae1754ef275e5f913c1fb221ac9ad8620d10
 DIST libkscreen-5.27.4.tar.xz 114760 BLAKE2B f59ec5e2e8266dbea3a9b13f9ebe80cc79231e204124e13a71f11b5e164c468de653ec241bc114e4a964dee3ce4f6cdcb9edce6538502c83370e324b64d3ea1e SHA512 2696e462ba6619842eebe08a0c3a72525241795462dccb4e693a18336a4fd2e4f6209fd73e3317392556a83b047191673e6d639cb2d777e7ee29e186ead1ee16
 EBUILD libkscreen-5.26.5.ebuild 878 BLAKE2B 0e7004bd0d4fb16f44600c201c96c13b5f26d7403cf3ab9e518d3f8e853956c2b4bcb935ac24580329e631a10be9d5ff60540d3ba0393e1177d58a100b73a18f SHA512 e621abe7d313f2b4c646dfa7afcc673a5786524c7563e89894be6bab508858abd2cade49e5eec14ed617de72732f607598e5974c155357d5555245ee2ad2596d
-EBUILD libkscreen-5.27.4-r1.ebuild 932 BLAKE2B e095108f30b35faada2a70226f187589c0953babf17da7863416073b302c4ff8ff9cec2a97439ab295914ef493316d0271ac1299fb7f7185590d8d45c4d1b4e4 SHA512 de5cd40618d384370df30ba7a52556d5b27cb1a1ef68370b0690e865a686183205cc5160421eaa784770ea282b25ebf8380896566809f15ac8e08df8a70ee89c
+EBUILD libkscreen-5.27.4-r2.ebuild 1007 BLAKE2B 2e6d93d709eae162f1232c210841c44a9cf39afec71d0b6599b4798c9984090bd6e72b1eda313bbeeab2542f33be5c931fc2821f70fd16da90c00b0ce05df406 SHA512 5597dc1920c5c45596e5ce8258a52ae059310745d8218e881bf53fee8774f62743f2b4433071ddcd09a2b8da99f380c91bbaa68d50ec158461ae7b5f0ed770a0
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch b/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
new file mode 100644
index 000000000000..35f0c088d7b3
--- /dev/null
+++ b/kde-plasma/libkscreen/files/libkscreen-5.27.4-cleanup-dpms-obj-in-destructor.patch
@@ -0,0 +1,29 @@
+From 771d68f6dd9d5ecd0a867280aae02fec1fae3fbe Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 2 Mar 2023 11:55:27 +0000
+Subject: [PATCH] Cleanup dpms object in destructor
+
+(cherry picked from commit 00d8e90f821123f04fcb7ea39724a1f221a76f37)
+---
+ src/libdpms/waylanddpmshelper.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/libdpms/waylanddpmshelper.cpp b/src/libdpms/waylanddpmshelper.cpp
+index 454d5272..e671b1fe 100644
+--- a/src/libdpms/waylanddpmshelper.cpp
++++ b/src/libdpms/waylanddpmshelper.cpp
+@@ -26,6 +26,11 @@ public:
+     {
+     }
+ 
++    ~Dpms()
++    {
++        release();
++    }
++
+     bool isSupported() const
+     {
+         return m_supported;
+-- 
+GitLab
+
diff --git a/kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
similarity index 87%
rename from kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
index c481da498507..aac088840e41 100644
--- a/kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
@@ -40,4 +40,7 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=( "${FILESDIR}/${P}-clear-edid.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-clear-edid.patch"
+	"${FILESDIR}/${P}-cleanup-dpms-obj-in-destructor.patch" # KDE-bug 466181
+)
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 19d1bcf99aee..d538e53f82e8 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-nm-5.26.0-unused-dep.patch 1943 BLAKE2B 1f6fa231a18152c3720ee82be40c08a40e5344cb6b982fa8b62a72dfd0883d87f626d193557abdc851115ab31d99e33a72613126d5258614c75d26e67f9b59a1 SHA512 c7182240e8ae86d994e6e36ba73f42ecdea78c84077397a774a4501607b6906fdc2cd98e354bf92e9ee2cbfdfe2a23d3a30d9566b3c37a3d866b1c138114a618
+AUX plasma-nm-5.27.4-persist-imported-vpn-connections.patch 1028 BLAKE2B f93687c822cdc2ecd7252c9aea89e17b31ef709117b111007392a27470d69620e0a5291c4ca7e53bc75d7bffcbc6ddb013bb412b79101c050b119b780bdc4228 SHA512 5febc7c9200e4fb0ffdce349458abc12086d0334fa794059fb2523eaebe3afc05913ea0c28aacd434fcf4953f567b4d45fde32fd8bfeab36304f497ee5e3e6bd
 DIST plasma-nm-5.26.5.tar.xz 972940 BLAKE2B 4f10049a0a946b67fd0638913c365558a8e95b80d1d896323f4030738f8dd4d07cc77c4aaf212c52d8ba89635d932369d2f69e134722d24a5eed41841b15409a SHA512 bb17b06de15cc5b36d1eedd4fc8551eff240f8e61a4a036450b2365c99eb5885adc9541c29aa95b311d79d57b62ab95f41b746402cb6de7ecee6c6c4e87ac9a3
 DIST plasma-nm-5.27.4.tar.xz 1151372 BLAKE2B b6a2c30c17b7fe5e19bba032ad0d4822c5f4ff931530cc4718d17c976317f782a3a318c1c2204ef84c2d247bb828cf7638e26283ecbb5246515c4648ce6592d2 SHA512 4077c63af9da002a8c6fc18a6fa1ccbadd84c9786a7e922209756b4ce4fc8a6780a092b5a412d79caf38872831035a3659c84fb73857d58ab0088dc73fc64c36
 EBUILD plasma-nm-5.26.5.ebuild 2613 BLAKE2B e0156c2e1586881ad198bbe6e9c9126388430c005acaf786949cb3005bfa8f23d69aba584c9086682898c247a5f3276b9e6936cb4eec5c841ed5c3ac4d07e5d1 SHA512 db130b38559fabfb44c49412636e0760b1f35176313ac3924a14e2be3134ddf172cdbd191ae0dcef77fc2fb9071766059af68d71ef4601779a653c1d3a1d3c53
-EBUILD plasma-nm-5.27.4.ebuild 2345 BLAKE2B 5acb6668a1c855a1a30abdfe6800f315e5024f12ebb11858720f3f5cefcf75c5e0bfef1cea13c6c507330a4f1d2c11468e57a0154d95594398e4729d2b666bf1 SHA512 bbe344e595e5b2e34ff4add18c7eaafd301ea5100544159d8d1037a5988995a41893e0823086281c117bd2daa5b81d042092e43708f7edfaba628a5226bdadcc
+EBUILD plasma-nm-5.27.4-r1.ebuild 2433 BLAKE2B 1e4df26c406a759c18728aae1104da081b69972c9a67423242d1d4eb3fe19964f6e1f8f8592fb4d8e44a7e7a67cdbcdf1f37210f9e93cfead12f653d13982598 SHA512 3344a2fe0d43721177e6f14478ff3b4586294b446fe7f64c095dc2697860fb08cc37de184a589480bf9003a9017913473dec8188ce7a8f820365cb54eab4b962
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
new file mode 100644
index 000000000000..8d7fc814c35f
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
@@ -0,0 +1,31 @@
+From d795e92bd12705d0ce506c4ac900b0ccb7bdc69b Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 18 Apr 2023 23:54:02 +0200
+Subject: [PATCH] Persist imported VPN connections on disk
+
+Otherwise they disappear after a reboot
+
+BUG: 468666
+
+
+(cherry picked from commit 024035190982ac5957310ef78fbc34b9c51766c2)
+---
+ libs/handler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 625cbabd7..57fb9f2e3 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -378,7 +378,7 @@ void Handler::addConnection(NMConnection *connection)
+ 
+     nm_client_add_connection2(client,
+                               nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL),
+-                              NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY,
++                              NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK,
+                               nullptr,
+                               true,
+                               nullptr,
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
similarity index 96%
rename from kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
index 420f8ce7353d..9a6797eed250 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
@@ -63,6 +63,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-persist-imported-vpn-connections.patch" ) # KDE-bug 468666
+
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest
index b59494cc11d8..223f63cc3b54 100644
--- a/kde-plasma/plasma-welcome/Manifest
+++ b/kde-plasma/plasma-welcome/Manifest
@@ -1,3 +1,4 @@
+AUX plasma-welcome-5.27.4.1-kaccounts-optional.patch 3455 BLAKE2B 47f4294b6ac94ce005d0079981fa31d33991ac01ec73adb768b4feb12ef169a70a7a13519efce88b5bb3d79bc7faa24054ecc10a79272a758e7ab64e39fa5b59 SHA512 a7533802112b34eb8a3d547ee5925f6123ce12a61423433f9a2014f3f37ae5d02da48748e535b3bd2eb5ae6d61ff4458af7960bfab2065e06d78047d26123a60
 DIST plasma-welcome-5.27.4.1.tar.xz 822136 BLAKE2B 6d5f1eefe7e8dbbcfb121d3d063a78eca8af132a53765298cbf4a46c41524f2aa46192956884b7a12e47bccf48d292acbb1ca4e4173ad0c05c7a84e8a9d73dbd SHA512 c63bcaf66163e248bd5067c7b0cbd445353cd28a900dfac8fde6e27231ba1f24388a4013378d71673d523e1ce42065c87aa8cd23d8bdf8285c221cac4262e6ac
-EBUILD plasma-welcome-5.27.4.1.ebuild 1172 BLAKE2B f7c8188689ba4aa60522bd67a7ca3522062e52a8c495dc8552759ee838e2cf92e925ec5d68d9df6791f1e1922c53ae5207e9c48dbe09ab815a78030fd4746d2c SHA512 bf4929a635d833d7e637d212c2a40b90dadba446005fe30f36b9e32202d17f20d03d6073a407bc07d760a9350bd06370dce082c2ef5291b100a744f5a368faf3
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD plasma-welcome-5.27.4.1-r1.ebuild 1526 BLAKE2B 5ff4e2b0e06230351dff463b062fb8e01d87d56bd0e713f6be446f414e447bc0306257adfe803c6598102c395cb44d0b0c98f36c2e9ceeb3820eb1965965472c SHA512 e682d249dfd915397821cc265049ac754d2b49419d5c272699ee4a866a3e5a87d79e1023a28a49fcf92ddc9ac05b22a19e71d7be4967db020aea04ed18f3e1e9
+MISC metadata.xml 550 BLAKE2B 78839fba571ddb92926c13ff6e8747b2d14af746f5e0f29483996df70a51801838c016de81ed9125fa79f701ff0aefe22f9bc95e71d068f3cc95bd210164fe5d SHA512 8d79e582ddf141e9e97e5de8036e4878f7a4c2acbb06669491da9e0d1ae64316d49d6a330b8c7268c411a42170d37152f8d7c1580ef3ad75454097780e92b24f
diff --git a/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch
new file mode 100644
index 000000000000..fc4eaa684a63
--- /dev/null
+++ b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch
@@ -0,0 +1,99 @@
+From 24092946ed95b4ddf7e7f4c0f5bd9000e45fecad Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Apr 2023 21:16:59 +0200
+Subject: [PATCH] Make KAccounts optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                    | 2 +-
+ src/CMakeLists.txt                | 1 +
+ src/contents/ui/main.qml          | 4 +++-
+ src/controller.cpp                | 9 +++++++++
+ src/controller.h                  | 1 +
+ src/kuserfeedbacksettings.h.cmake | 1 +
+ 6 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 772d79e..86db439 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,7 @@ ecm_setup_version(${PROJECT_VERSION}
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Network Qml QuickControls2 Svg)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons ConfigWidgets DBusAddons Declarative I18n KIO NewStuff Notifications Plasma Service WindowSystem)
+ find_package(KUserFeedback)
+-find_package(KAccounts REQUIRED)
++find_package(KAccounts)
+ 
+ ecm_set_disabled_deprecation_versions(QT 5.15.2
+     KF 5.101
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4eab33d..e0cc179 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ # SPDX-FileCopyrightText: 2022 Nate Graham <nate@kde.org>
+ 
+ set(HAVE_KUSERFEEDBACK ${KUserFeedback_FOUND})
++set(HAVE_KACCOUNTS ${KAccounts_FOUND})
+ configure_file(kuserfeedbacksettings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbacksettings.h)
+ 
+ add_executable(plasma-welcome main.cpp controller.cpp resources.qrc module.cpp)
+diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
+index 380c074..86da39b 100644
+--- a/src/contents/ui/main.qml
++++ b/src/contents/ui/main.qml
+@@ -124,7 +124,9 @@ Kirigami.ApplicationWindow {
+                 pageStack.push(kcm_feedback);
+             }
+ 
+-            pageStack.push(kcm_kaccounts);
++            if (Controller.kAccountsAvailable()) {
++                pageStack.push(kcm_kaccounts);
++            }
+ 
+             // Append any distro-specific pages that were found
+             let distroPages = Controller.distroPages()
+diff --git a/src/controller.cpp b/src/controller.cpp
+index 7586c23..de8fa85 100644
+--- a/src/controller.cpp
++++ b/src/controller.cpp
+@@ -50,6 +50,15 @@ bool Controller::networkAlreadyConnected()
+     return false;
+ }
+ 
++bool Controller::kAccountsAvailable()
++{
++#if HAVE_KACCOUNTS
++    return true;
++#else
++    return false;
++#endif
++}
++
+ bool Controller::userFeedbackAvailable()
+ {
+ #if HAVE_KUSERFEEDBACK
+diff --git a/src/controller.h b/src/controller.h
+index 20ba44c..97a9d1c 100644
+--- a/src/controller.h
++++ b/src/controller.h
+@@ -15,6 +15,7 @@ public:
+     Q_INVOKABLE static void runCommand(const QString &command, const QString &desktopFilename);
+     Q_INVOKABLE bool networkAlreadyConnected();
+     Q_INVOKABLE bool userFeedbackAvailable();
++    Q_INVOKABLE bool kAccountsAvailable();
+     Q_INVOKABLE QStringList distroPages();
+ 
+     Q_PROPERTY(QString newPlasmaVersion MEMBER m_newPlasmaVersion NOTIFY newPlasmaVersionChanged)
+diff --git a/src/kuserfeedbacksettings.h.cmake b/src/kuserfeedbacksettings.h.cmake
+index f30924f..a76aedf 100644
+--- a/src/kuserfeedbacksettings.h.cmake
++++ b/src/kuserfeedbacksettings.h.cmake
+@@ -5,3 +5,4 @@
+  */
+ 
+ #cmakedefine01 HAVE_KUSERFEEDBACK
++#cmakedefine01 HAVE_KACCOUNTS
+-- 
+2.40.0
+
diff --git a/kde-plasma/plasma-welcome/metadata.xml b/kde-plasma/plasma-welcome/metadata.xml
index d925f2439758..7499be9e7e7d 100644
--- a/kde-plasma/plasma-welcome/metadata.xml
+++ b/kde-plasma/plasma-welcome/metadata.xml
@@ -8,4 +8,8 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag>
+		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
similarity index 71%
rename from kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild
rename to kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
index 85c827c00945..1f431b9ad2da 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
@@ -12,16 +12,15 @@ DESCRIPTION="A friendly onboarding wizard for Plasma"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="telemetry"
+IUSE="discover +kaccounts telemetry"
 
-RDEPEND="
+DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/kaccounts-integration:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -33,12 +32,27 @@ RDEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	kaccounts? ( kde-apps/kaccounts-integration:5 )
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	discover? ( kde-plasma/discover:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-kaccounts-optional.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use discover; then
+		sed -e "s:pageStack.push(discover);:// & disabled by IUSE=discover:" \
+			-i src/contents/ui/main.qml || die
+	fi
+}
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 	ecm_src_configure
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index da31c28493e3..faca93d48ba4 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/courier-pythonfilter/Manifest b/mail-filter/courier-pythonfilter/Manifest
index 013b4f67f2dd..7fba7706bad6 100644
--- a/mail-filter/courier-pythonfilter/Manifest
+++ b/mail-filter/courier-pythonfilter/Manifest
@@ -3,5 +3,5 @@ DIST courier-pythonfilter-3.0.3.tar.gz 61994 BLAKE2B 286e9b9af580512080663cf392d
 DIST courier-pythonfilter-3.0.4.tar.gz 63336 BLAKE2B 0a002b68a1828d20258f7671bd91bded3960e1b60cb00ec80ca43fcb783729509c18b2603fbc044649b2514a6911b71b369c0525c87a47719b5328dfd78dcea2 SHA512 00b08b607ed6c613a5a010855c34580d0ea22e11e6ca9d5f2a9806c9f1f9cce15d32b66822433c29e23b71b955da18fe63bf78fb6240e6e6f026a27f52c2d86c
 EBUILD courier-pythonfilter-3.0.2-r1.ebuild 442 BLAKE2B 9b8b0b49ae83409bf57a791a4da9416239f86816a06e0ed34364db9f802fa124a86290a05120e34fbcf84a19b9228f28c40395779fc918241a9d553d41572ebf SHA512 704f1e52a48eb9ea7e2b3f4a8e8d0714551d92e1069a3ad41a4afbf4919f62f4876d1055c4adf4205264382cf0ea2f2da3cb8f11413196ee65a199fa6ff6730a
 EBUILD courier-pythonfilter-3.0.3.ebuild 447 BLAKE2B bdc07d40c3837f3faadac4304329e85762af713ffea9248dbbb25aa452263169b304a83dd852c4400232ef173d1a730aa4d70957926fcae40a762c17af6c76f5 SHA512 5c0ecb0eca0dffec6b095846f72b02b6c11531658604f069e8d3b3bd5cd1dfdfbe23000c7a23dd71252042f098b5818a24112bf2790d88ef926fe65e2b159473
-EBUILD courier-pythonfilter-3.0.4.ebuild 480 BLAKE2B 1e6c3eb45ccfc99b3966b6b9f2f1e5f3f7d40acf5e1e6230699d61a23aac0cbb54f58285fbd6f44d9b5cfb269db6e6001f3fa3e96ebc83999167fbb09d072f6c SHA512 71e5d6e174056eb98a167cace36f7d7faf472ad217d4cf68bb87de7918b3605222c3d76c30f74b96d15e35a8579aa20d7833c8cb576fb0334295ca7f95a5ac6b
+EBUILD courier-pythonfilter-3.0.4.ebuild 479 BLAKE2B 4fff6ee063550a8cc48894ae4ab404badf829d8d88f53c59f89925580c26d3bddd7d91c4ce320899d04c8f81b749439e4dd4c0aea987f0f323c7034eabeb44d8 SHA512 abf810e01578b09ddb395431515c1482c422088fbe796ded37ce6f94dcde4b7fbe63b965df034258d054796b726bb8434dc4715d3889567c0fa6b0961f4835ed
 MISC metadata.xml 300 BLAKE2B 1626182463d88ec1e3d6be91a8ada0b0ffcfe1b04f9a7dbf937f120530be568e6961df24ba2a8cb0395b9926752731c013f068b61b40909e58eed812c7a89058 SHA512 d44719d9f36cede9aaf778fad31ae0726b17e14c38ab2720c628d7f8e50eff0b58ec22731324ed94ef08c44212f4e34354d6ad89a6b762bbafe5af2d798d1758
diff --git a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
index 074fe41d1cd8..c4079fe5c473 100644
--- a/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
+++ b/mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="mail-mta/courier"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 2092a14100b4..256dbb3b52f2 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 7e0b18b1c3fd..fb2570125191 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,9 +3,11 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.7.4.tar.gz 4833834 BLAKE2B edb716ef4576d339189f11b535a62f3c6f8f28613723d916f13cdd2d37228aa8768dacdb9d8616c83f0ded3a3c801c45747375ea6cfa505b668a7163c4637128 SHA512 972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236
+DIST postfix-3.7.5.tar.gz 4834332 BLAKE2B 60be442c165e722dca3f1b5ece30adb85493560c583f6bb485e548f35bffe9e5ec27193eb68222f95a3076007af046622c98ee954167b53d2e306969ccf07647 SHA512 097c8f74386d746e849176c1344fe51c957b972cc1b15ebbb27cee4c825deae7201081cb1212e3fb12f16a6795c86381492d71123a8bf287fc8b58c6979fbf8f
 DIST postfix-3.8.0.tar.gz 4851893 BLAKE2B 3ef0c0c83eed3263c890143ae962674dfbfa01f589f1b503a01d57497e4732171aa58468357276f29a9454c577573e8442095c2db25005324754dbd305875297 SHA512 a66956b0cc5eb6ad5ee926348b584ba5640586784aec794a84c40472faecb6313d46537c9f5696edfd8fda070591925a0cfaedc014e15bb3496195e5fb9ee4bd
 DIST postfix-3.9-20230416.tar.gz 4823390 BLAKE2B 5289aacfee4c7b4db34e520b2831ee7b700767eacc28396d14c17e6c7a1b213b51cb2731aa853f2a3a521f654d5a38f83c70cd21221ea71be484fa205b644e57 SHA512 40f3811cb59b843e767dcac163df0c1a6162e826deb162bf5ac35344ab5f40cd6333ec0d96e0f472ceed3800d5cd5f3429ea61749f4a66bd7e3091d9564ba9a3
 EBUILD postfix-3.7.4.ebuild 8023 BLAKE2B f1ed37c430536e96591beceb346144d28bf5eee3a1f93d7d41d4db3f3ed36b9fea7847cbf0c3b278a8ee99ec93ad91797a8fccfad5104717deec5bf4ef18396e SHA512 0676646a5d0bc5187779b707593b8c6ac438c2f13524c4105bc4955feb57ed40aa86df78b740bec4cfa651ce22e44075d8fe6bbecbe44ad591842634856403cf
+EBUILD postfix-3.7.5.ebuild 8029 BLAKE2B acc668752b4e0f4df4cb5fc03a2fb1ed723018a2a6ebd016d7f3172203151f83d9abc23f9c50924788cfc57ccce9ef39b7968d6b7c4ee888f2120afa25182779 SHA512 0cefa25cffd806d11983d9324b10668ca53ff18a5a9192bcefb4b92ae00fc9acb8cbabd75b6fb38089b62399d50d2076dd1f2b2c53ce5577ad04e9054d97219e
 EBUILD postfix-3.8.0.ebuild 8196 BLAKE2B cd5dd1fead1f37a73ca3b2ffd232db629b617470d6543cd3d6b0fd34ce6b82a2bcfd7cac91a81719fcbb5097cd478548227cc01aa16aa71249ea7c923ee61c64 SHA512 38285f7690cc46d9adb91dfa0d49e58987b45f673b85d09e5acc65658c5cb865129e8c279a95d5eeb4276bcea7ea72e6c293c071cc05639710686681591a2b15
 EBUILD postfix-3.9_pre20230416.ebuild 8199 BLAKE2B 4415e28f87a7a5a1df454e45f4d296845f7cc1947a7df900cf25d4fa1c4c73158e831d78e5d0d427ab5d09f96536803a56d2dcb2a71f142d288a631a4219e5ed SHA512 50a2464559afd3582603876caeb44db9a733344d7ff9524b8b68015b0ee5412526703db6b4b62a955f60e4e7bd4545a811ce0552d69e9346c0196e05fc1be86a
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.7.5.ebuild b/mail-mta/postfix/postfix-3.7.5.ebuild
new file mode 100644
index 000000000000..cbb495784e56
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.7.5.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	dev-libs/libpcre2:0
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap:= )
+	ldap-bind? ( net-nds/openldap:=[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl:= )
+	pam? ( sys-libs/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+	"
+
+RDEPEND="${DEPEND}
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!mail-mta/ssmtp[mta]
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="" mylibs="${LDFLAGS} -ldl"
+
+	# libpcre is EOL. prefer libpcre2
+	mycc=" -DHAS_PCRE=2"
+	AUXLIBS_PCRE="$(pcre2-config --libs8)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		# change default database type
+		if use cdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		elif use lmdb; then
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"lmdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			AUXLIBS_CDB="-lcdb"
+		else
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger, collate and tlstype
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+	dobin auxiliary/collate/tlstype.pl
+	dodoc auxiliary/collate/README.tlstype
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue,log}
+	fperms 02755 /usr/sbin/post{drop,queue,log}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	dodoc -r README_FILES/ examples/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	if use pam; then
+		pamd_mimic_system smtp auth account
+	fi
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# do not assume berkdb
+	if [[ ! -e /etc/mail/aliases.db \
+	   && ! -e /etc/mail/aliases.cdb \
+	   && ! -e /etc/mail/aliases.lmdb ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 938537ccc9ec..167d7c98f091 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 1f651b6ab5ff..82eb9d08f01f 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -5,5 +5,5 @@ AUX asymptote-2.85-xdg-utils.patch 762 BLAKE2B 4b5ea874e89723e0a26b3a16a55660703
 DIST asymptote-2.83.src.tgz 15044624 BLAKE2B f364d7fa5d09bfc94f2556d5c99fc2751182f4a231544c24b449f02f36cca62e48272827f5bb405119b82d75517ef1fe49ec87cb75eb30de92ed95ac360a553c SHA512 cb59731f6d68658746cd1e686a54b6f590e4a4990df572e89b4b5faab6bb8ed75de9d7f75e65b8ed76227ead59930d5492d54239db6acdb4bff2377ac2b97dec
 DIST asymptote-2.85.src.tgz 15073771 BLAKE2B 5fb965d6fad5c138c00b76a55158c3808022de84ba2a5568af551fe744e5ab0dc3caf168f9467517d917c9716a89a3fd1064324991e8d058a7a27138648903fc SHA512 81e62c3b5c1a4d8a12b37c9ca45f0141cf4034719f08155c2eb61989a2132a79053d611dee29bc0ea24b0aa05d2b4cb2b0dfeadec51e754cd65caf4ace7cc5b1
 EBUILD asymptote-2.83.ebuild 5535 BLAKE2B 9323572e8bb0515dae7b7b903e20af1db5aff8f2664d6cb505105608119726d91ca46c44bf678f23761634090a168977d5d993e2c6ff0e786d0142d266326720 SHA512 5face8f36e7f19c4e51e41de945f593e719dcfb7d9a6da933f770c21f2ac90a67990cea4579068ac51de5e56dde32494e5ab682e182a4169f7bed71c35707535
-EBUILD asymptote-2.85-r1.ebuild 5537 BLAKE2B 83dafdd576e126ef007a25b35dc89132ddbf447123ccdfa16e879e586313648d56196fb94ff1b939c389af0f66f02f99013ebe334a131bb01c33fb6e1fdf1f9c SHA512 367852dcb1328fc5b082fc07770a58b9be368ef72d15966b843e513901efc5f7f8f1dc5795d5cf666ab377d065412e718976fc40dc4b16260b99103736831511
+EBUILD asymptote-2.85-r1.ebuild 5535 BLAKE2B 0b32607680560aabef0873e89cad7f3a751cd7efacea1d7327a18e49aac3905a331b05cc1770b8457764324eed16c5b27f0f98e23b243e84783bec47245a45d9 SHA512 447c5cf46bd62e61b8de8f616648a89616a911cdc257dfe5ce1db7ab2bee22de12b757605fae3a3b0f2df8dcadb0583246b79eca33f706bf58715d4fef1c6c1d
 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9
diff --git a/media-gfx/asymptote/asymptote-2.85-r1.ebuild b/media-gfx/asymptote/asymptote-2.85-r1.ebuild
index ba11f4a8c353..03610416f73b 100644
--- a/media-gfx/asymptote/asymptote-2.85-r1.ebuild
+++ b/media-gfx/asymptote/asymptote-2.85-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index b86d6fa059cc..58e14d5dd1a6 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,4 +1,4 @@
 AUX cura-4.12.1-code-style-test.patch 406 BLAKE2B 66a94ddbb95402b2edbf2b149173f5f8ed63feaf468c3300e5d8d9cad2ca1c783d643e4e051d6994db46cc3fec853172b84f98d1c3366f995a831e7fa1b27019 SHA512 5c739fcd4c4259329f39e630d7c33e55b9a3910ec1ca778ba666e71f4087f1729c4f18b138301580f8cf8fb15b297855fe72337f2fa0b58454b8e0beecdccba3
 DIST cura-4.13.1.tar.gz 42339030 BLAKE2B e5c10ff03e42c0f88a2e7d827bf08f45c57142ca7b1dda6c00ccfbf0fd486dd366db23f00990ac5a021ecbfe038b2ca0247df8ea5130f2ee1efb766efc6f152c SHA512 6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
-EBUILD cura-4.13.1-r1.ebuild 2563 BLAKE2B bde228bb754e6b3bad7bfc0f19e05d5a03306d927826b51bc48cfbfcafc03c2f7b29b969ad3cf1faacce1cead0bec0e3c2691bbfeb29646f97e88bbc472ff9bf SHA512 fa6dcd52ce1a93143854f17898b13ad7e482719ce31041c8fac21ec87dfca2ccdf2623e5caf6e2bb02ab6681dfeb6bf8082a03c079178e9beaff12b7db2d3b3b
+EBUILD cura-4.13.1-r1.ebuild 2563 BLAKE2B f73d4141d25de6379afbb3cf9bad9d60607c8e3b3342b9d662451ea02d2ad89dfd6b3f5e86bf61e802ae911fe91b503ffc5ebff7d5fa53bc55fabde034acda23 SHA512 fa0da02ac267ab0c60672460fd1e621bbcee5d58f98553a7280c274147c6f0007bb1ed4736702b7951233490c86c8d39a733880cee90a0882d0efcae3606498e
 MISC metadata.xml 851 BLAKE2B 4b029cda9763319d2936eb36b9b1540fd9d6f99eacbc668bed43ed4d14e1ea06dc98945009819b1ae154dbefc65735107946542a69326b00f2dd11131bc71355 SHA512 904208eb672a7f75931d290de0413b5d18d7f8a3fbcf4f29d777b532c9152b7fb9064a4fb77f40e21c71ce8ac791c3a12ec3bf6c650ff0bfbbc9f069efa2e8cb
diff --git a/media-gfx/cura/cura-4.13.1-r1.ebuild b/media-gfx/cura/cura-4.13.1-r1.ebuild
index 2d88c216d7bf..f7135c103b28 100644
--- a/media-gfx/cura/cura-4.13.1-r1.ebuild
+++ b/media-gfx/cura/cura-4.13.1-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="${PYTHON_DEPS}
 	~media-gfx/fdm-materials-${FDM_MATERIALS_PV}
 	dev-qt/qtquickcontrols[widgets]
 	$(python_gen_cond_dep '
-			dev-python/importlib_metadata[${PYTHON_USEDEP}]
+			dev-python/importlib-metadata[${PYTHON_USEDEP}]
 			dev-python/keyring[${PYTHON_USEDEP}]
 			dev-python/mypy[${PYTHON_USEDEP}]
 			dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index a31da4b42f09..c999600725f8 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,5 +1,7 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
+DIST feh-3.10.tar.bz2 2109603 BLAKE2B 2c3f52c7536110b5aef7e29fea366b502e39034b2de8b218faa071996f24ce0bf4b3283feeda96bc7542ce15bb6f1e68d2a2895a75949fe2e7c6ba08b779daee SHA512 9dc242a545590ab20847662613c289f4b78d44a1647c3696a65fd05c307628f869adf68fa3a66ca637b3974a309efb0b96d58a7aaa3d29725faf21208f40383e
 DIST feh-3.9.1.tar.bz2 2108873 BLAKE2B af559837224a90e403015648717cb9aa516d18bceb0a49a0635b471435370209c80b77a7a87f66b22c99615d44be0832a0d03152aabde72917417e5f992a5d8a SHA512 78682ec80df6b6655dbc18774ee95b3d68f1711a50129a9befb8adfb8c1a74aeede2493a35955687cdc2aa079978927727dac02543643418ef8deefa0d8c6d05
+EBUILD feh-3.10.ebuild 1546 BLAKE2B 79abfd9e44d752b7b68d3a0b76bb153ce6c6b45be2f507f4a1d36a01a1503b7b6e0aed6555c9c85c1617e2a8c408f33a074336205d0ff79ba7923db4ac50c887 SHA512 86fffbeeba8461d7203dee78a0c7cd249cc296e1a8c65b598a1e3d13c20c5c022392d9c16995d6c07b47a3d6a4d861df1b20b334948fbd38b016d28ab5a86cb8
 EBUILD feh-3.9.1-r1.ebuild 1546 BLAKE2B 79abfd9e44d752b7b68d3a0b76bb153ce6c6b45be2f507f4a1d36a01a1503b7b6e0aed6555c9c85c1617e2a8c408f33a074336205d0ff79ba7923db4ac50c887 SHA512 86fffbeeba8461d7203dee78a0c7cd249cc296e1a8c65b598a1e3d13c20c5c022392d9c16995d6c07b47a3d6a4d861df1b20b334948fbd38b016d28ab5a86cb8
 EBUILD feh-3.9.1.ebuild 1532 BLAKE2B e2a475b618b97749c568e6afd10b4047c137964b7f71b8cef77277968a42a228801ce924ea6e9a47dd6b2dde66771404fd6d970029a0829757299b0b820b7bdf SHA512 279bd900631c97e9e14998ba7629b92a4f057f0229f440db0f1080b087810f9a49366ea5c5e0892c5fd5bd25c6709baed6da3c55bb1bfd9508aa01f60b29ffc9
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.10.ebuild b/media-gfx/feh/feh-3.10.ebuild
new file mode 100644
index 000000000000..ccf4a73ffa70
--- /dev/null
+++ b/media-gfx/feh/feh-3.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="test" # Tests are broken.
+
+COMMON_DEPEND="
+	media-libs/imlib2[X,text(+)]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/libjpeg-turbo:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index f11e57a9a4f4..c88696f44dca 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,4 +1,3 @@
-AUX jhead-3.04-mkstemp-fix-makefile.patch 1496 BLAKE2B 99266c5b86f94e6b173ae48e72990503fdb9d6d55e10f509e94d08fa0e821f25075868c8c6587b69c0299caac738b4872f46473236cf714eb5ed7ff0cacbf1f4 SHA512 f1f682a7b24e5e6e31125f80cae48e6c9e1af1e9f21b347784da0724a73e10082ff45b5bd36210883e8163048e3174efe927db95ceb660de821338ff77b05575
 AUX jhead-3.06.0.1-CVE-2021-34055.patch 3779 BLAKE2B dfecaac2276d5b9c3fb85f0826bf814f468ba18d78baa2b1a979393cc08d24d00c639462ef470f1c4d3c4889add34a89941798b896971e8b868538ea691af253 SHA512 8d586c3805574b9b2332ddda0693c93052cbf7bc4930694e485bd7a3d85a2255f86d5222d99da851d3d81491ad61ddca4810c23d528f41b1b0784145f4f50dd9
 AUX jhead-3.06.0.1-mkstemp-fix-makefile.patch 1575 BLAKE2B a3f7defa7fdcb547d0f9ed2d06c690effabd4435769fadd26cc26c939dda7ec865eb4ff9ffaf5cd6e817caa759d1bcdb741c6b2105b32d1954703d595d0c16a0 SHA512 36b15c3b557be1bfbfffec5e821389cdf9fa9549d5d8b60d5e30edf4177b29f4f34895763f722b7e5b5510ff7f1b46f6c35f13345750a408f2d500ddd4687144
 DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B 100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2 SHA512 7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9
diff --git a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
deleted file mode 100644
index 0bb634b6f5b9..000000000000
--- a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/jhead.c b/jhead.c
-index f78127a..d8d1472 100644
---- a/jhead.c
-+++ b/jhead.c
-@@ -376,7 +376,7 @@ static void DoCommand(const char * FileName, int ShowIt)
-     // as mktemp - that is, that between getting the random name, and making the file
-     // some other program could snatch that exact same name!
-     // also, not all platforms support mkstemp.
--    mktemp(TempName);
-+    mkstemp(TempName);
- 
- 
-     if(!TempName[0]) {
-diff --git a/makefile b/makefile
-index f8f195e..c36d34f 100644
---- a/makefile
-+++ b/makefile
-@@ -3,17 +3,20 @@
- #--------------------------------
- OBJ=.
- SRC=.
--CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
--CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
--LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-+LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1
- 
--all: jhead
-+TARGET	= libjhead.so.1.0.0
-+TARGET0	= libjhead.so
-+TARGET1	= libjhead.so.1
-+TARGET2 = libjhead.so.1.0
-+
-+all: jhead $(TARGET)
- 
- objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
- 	$(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o 
- 
- $(OBJ)/%.o:$(SRC)/%.c
--	${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-+	${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- jhead: $(objs) jhead.h
- 	${CC} $(LDFLAGS) -o jhead $(objs) -lm
-@@ -23,3 +26,9 @@ clean:
- 
- install:
- 	cp jhead ${DESTDIR}/usr/bin/
-+
-+$(TARGET): $(objs) jhead
-+	${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
-+	ln -s ${TARGET} ${TARGET0}
-+	ln -s ${TARGET} ${TARGET1}
-+	ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index 0c2bc7937b3f..210f6dcd82f1 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -3,6 +3,6 @@ DIST mcomix-2.0.2.tar.gz 515427 BLAKE2B 3f7b7a0788622173049169034a0a8ed3d3d5fb64
 DIST mcomix-2.1.0.tar.gz 517070 BLAKE2B 71aa67b48ac4cc09f12516312a07c1688e3d9ba086e0af8fab0f22549814fc82841b30965b7ac4e90192086338414c50d253af2d37b158fea8fc2358cee3d3db SHA512 385654c48192c20e285a053a8a90f1e792d58f7adbb0960745f31703d2ff5906f5e5bfd868ebaa08dd27314543a761a255503e5d586edd1baa064ffcea0205ca
 EBUILD mcomix-1.3.0_pre20211015.ebuild 1744 BLAKE2B 546324b50681f4ce3b9909e39efca2ef61e178efd637219e9157a41ee15bd693af63c5c8f9ebfac31ae3446f73c8fb451c385b26a82e8a45ef559582076cc28d SHA512 2b8f4cfd716f9b5205754e7ec54b3512169e49f64cbfcbda99150f14e8e245d513781430676fb8824290fc2e1b9e9ddb5deec19826d725ef441e3ca9229f5e16
 EBUILD mcomix-2.0.2-r1.ebuild 1110 BLAKE2B 574e122d0a622e2687ba6925347f3f9b4d9fed85a97738c39603eff4aac5c282a622134dcfdaa8eb2b4e6c6dbaf05ed29590206957dd4559bf943c9fa2482843 SHA512 82d7d5cd61e753765a3870516a694883f2bb0d276c7f53a5b1428acfbd76ad6cc59b3141714237a85b4fb4a7a424a0c36dc6242a66d1644737f2a2b358b3b479
-EBUILD mcomix-2.1.0.ebuild 1110 BLAKE2B 574e122d0a622e2687ba6925347f3f9b4d9fed85a97738c39603eff4aac5c282a622134dcfdaa8eb2b4e6c6dbaf05ed29590206957dd4559bf943c9fa2482843 SHA512 82d7d5cd61e753765a3870516a694883f2bb0d276c7f53a5b1428acfbd76ad6cc59b3141714237a85b4fb4a7a424a0c36dc6242a66d1644737f2a2b358b3b479
+EBUILD mcomix-2.1.0.ebuild 1109 BLAKE2B 1a0c9bf3cf215e3568f4894dfa2c3eced7e7cafc4a96b2b4dcf09e0e00669d043bff0d31f48e41c7d182508acc23a508f2ebc3a605571e2498a49c1aafdff663 SHA512 438b5b9bdcf53ab36b8509ba621eb44b47ba292b78c78d69ace564b258769265a297a395bb0a86afee0c571cf6ce361cda1d1ae9e97fccdbb52aa17262fd76f9
 EBUILD mcomix-9999.ebuild 1095 BLAKE2B d01ec9ae161b0b2d7f3ca6dd4844a0c0e457937851661089e56a769ab714a4a931be7d877f7ecb10fe80c04f3d53066dd1a610f9f25ebd67cd5e0a4e9f3c65fa SHA512 0c584488b6906fc29d17e8a959c2afb92e63e940ab490d6bac828c0982d83969922ebc40d6e8ae3b658a1e91742649c2e0a5f34ec8fbafa33552456f9d96812c
 MISC metadata.xml 339 BLAKE2B 16c122a9f4454ff61d2b777e14de1bf321ba4d98aadd3284f88a13419bac2cdb227bd1001ef6960aaaa183b3e2f86f2d7b5a555aa9a17a6ad1f9e46db2657609 SHA512 a66ff965443f30fe9c647a760359ee71b4ed9cbe5ff684979fb547823bf1ae5ffbf8cd4128afdfef13d07c03e953ed5495b9e80526ec01a0e53b66b1b0f2e6dc
diff --git a/media-gfx/mcomix/mcomix-2.1.0.ebuild b/media-gfx/mcomix/mcomix-2.1.0.ebuild
index 76304676162c..1cfb05564ec3 100644
--- a/media-gfx/mcomix/mcomix-2.1.0.ebuild
+++ b/media-gfx/mcomix/mcomix-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 187f6593cf19..688228233d5b 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -6,7 +6,18 @@ AUX superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch 690 BLAKE2B 410f712603346
 AUX superslicer-2.5.59.0-missing-includes.patch 1225 BLAKE2B 0d9cfbd9dfaf6e066a4206ff7bfa88cfe92c96e102ac2105a4a4fb5288b15a878969bcd00719d89a917fd3216b42aaba3688b6ad8a6b597eeed58d4c6a26de05 SHA512 cee42f67820a0fb98f1bdbbdf160bafcfaf1d1f87dbf85dc73781e8911b4ee76697996bdc23b9acc2c502701053587ce3d9a71d301ccb2bf9ee27e010a8bd855
 AUX superslicer-2.5.59.0-openexr3.patch 2361 BLAKE2B d351d05190977e55047504d13ab4172c7eaf7fb2077a61a448dd29a8a27084ee4b13284143102b7ea3dff0edc8b20675dff0014e9f26cd5f448e50c04a1d6779 SHA512 840e51b8feb3568ff46d309ece063f7188018fcaa43d19ec50ede408fdf2c237a3b7eaa11ba24409d8c3f7d6f5fb270181508cc56e0b2b0fef68b766130ef1eb
 AUX superslicer-2.5.59.0-wxgtk3-wayland.patch 489 BLAKE2B d801db8b71aff816c3703628beb2e90d06ec4d85b982cd137e005eb4542aae308140c21b3b6fb1c72c07dd3e90e38668d6c2a69df054bdd414c43b9f8fcea57f SHA512 495d8d62c8cdf4ff9a075366dbc2db5c80a1c99bcd23172db9cf64dd649d70acbca44182722a71d790feb84c9a67a81403d75ff33b77444a1251b1f45f7b4b9e
+AUX superslicer-2.5.59.2-boost.patch 12899 BLAKE2B 53cfab69e12af506c276fcc34851c62deba2c4ef5682176977ed1b07a60c1967264f56752f0c286aeb059fa7924272fa5d837c8c2add768590dd9604444705fe SHA512 798a275a6b310e6fa16e630a841fc3198fc287fa1ac9de0fc70a41effadd30b10887fed969ab59e73993c9ca1830ac1a8e633bbeaf0560a9225d0c5f1b00eab3
+AUX superslicer-2.5.59.2-cereal.patch 1807 BLAKE2B 0ab8eb8e7f283e09e19c55d95bd6fe874797cc3d67f153a7c3920e1ff02e3b974c64f0dfc510b0cf3dde2484eeb00f550eab636e304bb6ba3c76b066bf537caf SHA512 503d3e8483315affb77f9bf9299e529455b73484cb278eda413a7e17f27f687b24158210b2fbf50581a970821930511934c994fa70c2ef8b68702f7614528d38
+AUX superslicer-2.5.59.2-dont-install-angelscript.patch 427 BLAKE2B 8f853d1c8c861bcb18e3272467c5a4ca745b67790d88be9943d4cf92f1f5dfdd3b4e022ba697c90997ead2c8ad77debf7ea96fc262a21caa2087cd7b62901bdb SHA512 c4a718ead714b9d2a22cff7e9a48846954f9606290ad533c0e491429b3455f43dee7a10a93a34f564e03e9e3b2eeef87d8276f6062d770f57afef27a7fbdb868
+AUX superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch 686 BLAKE2B 869ba2516ecfb72cc59b50be5590ff07879b146dcec7b5b7e9cebd6d42d5bb011f353e89bf921b825392f4b0dbaa0cef5032f0a5a5b691e829ae7ad84e4e31a2 SHA512 5eb73e13d691e9b5a89a5f06181e7b8a5e13e7b26a9ce80b33618ab945aaaf2d7a29bf85aa4cf702212f33994ad28f19e11359ee29055175194e13173704f3ec
+AUX superslicer-2.5.59.2-missing-includes-fix.patch 2165 BLAKE2B ed39e6e2e07e7623a7dfc87f5127f310ae8d7847597619634d162bca73cbb39f0fe08e6ea64e0965d5bbc3c06c9fc61b14c808b8c97f227599cb94dfe88d73dd SHA512 7deacf27bbc17e847b46cea00193c76bfec7b3b885f3fefd67bc0da8ec1df0c284252833b09560d0a5240630c0e3d88cc49fe40a1fbf80295f39fb18139dc655
+AUX superslicer-2.5.59.2-openexr3.patch 2357 BLAKE2B 0d8c889817aaa7ddcdfd9ee434a668ce56b8c6906d61e73f118d8d37ef6a86d1315191956316e7d459629a9e60291ff86f0915bc5a877722ff99f8ce55af0351 SHA512 d3516333ce841b75c4da4f178e6e099b18fe64254484c286ad5b71d284407aa2e9cd4187b4c192b7ff3557170c0cee818d252b1c11e6b09263f9c2dc216e8aeb
+AUX superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch 384 BLAKE2B 25be6671e091d04dca0896448786d90a36e4b6ae5c9b31c8a249aa226788f338f0e40c9a8f849e7a731ce0ba1e5e531dd314138d6c5295d64067cecd9e0be6de SHA512 57a42c6936b369ebadcefb91da32125d265a763f073d7e8d0209a87481c057066848799bac998a83ab4aacdbe4da01fa4d721794d982d52d2f5cda1df59d47b5
+AUX superslicer-2.5.59.2-wxgtk3-wayland-fix.patch 485 BLAKE2B 4bd5634f39ba6132bb4216807fef254a88f07f5eb1162de12589c22b038c2876185a801ed481738d9fbbb04796952d304f17010fd61eb347213b649b13f3064d SHA512 4867192b069829ff0fd3d2bf86e2117979e505f4764223f7d0b874c15fad9cffca58d8e55a518a56cf156fee2187040115866a10e92aa903e87dc6ec909d0339
 DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939 SHA512 bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
 DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd SHA512 1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
+DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B 20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e SHA512 c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7
+DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b SHA512 af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd
 EBUILD superslicer-2.5.59.0-r3.ebuild 2243 BLAKE2B dd9727cfb208c694890deccc696845ad8dc0ce48a17a244513c333854b782dba9103b713482909cfb6238ec3063514f68b960750c2a2a5a667355d8373beef91 SHA512 a8dca57479744a2de97e2dc6feb37a5b41a3a5e44878d8fdb37689d70895ff7eafd782ee4178df65738c4c995aaba81f1e4eaa2dbfd22f6d09c54e197315b61e
+EBUILD superslicer-2.5.59.2.ebuild 2227 BLAKE2B 3b8862dde38444cb54d7f9384d2f25287657fe31b1e67eb6d33ddff6fd3f029d27c0f18b6064d5c19af35567e6ea375180dc69adea2e006d71a87a87fc7c3586 SHA512 3d67564cb66d811ba2ca4c26c330edd1104fb8c622c5e116433088b90fd7e523232627a2574f398b26e2d2f5b490f9b68cb531ad704a58e6ee0e1f72998a086e
 MISC metadata.xml 413 BLAKE2B a43550366844e53b0ebed37197d33bf38efb555eee344f053f90e35e939263e3959301fdd072d5b6925d1e3e0d1fd629e2f459356e2f227006f8784a4364fc11 SHA512 8e1abc223f2e24cca551b08cbc37910f2a43319fce7299e52dd586dd6454c83e98e59b8d14c18613c8894fdca33d04297affa2da1f4aa001a5e200e4b5f2c331
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch
new file mode 100644
index 000000000000..ba0870a480b0
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch
@@ -0,0 +1,324 @@
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029c..4791f06 100644
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -9,7 +9,7 @@
+ 
+ bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
+ {
+-	boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
++	boost::nowide::ofstream file(path.string(), std::ios_base::app);
+ 	for (const auto& element : data)
+ 	{
+ 		//Example of .pot element 
+diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
+index e7c81f8..a626986 100644
+--- a/src/libslic3r/AppConfig.cpp
++++ b/src/libslic3r/AppConfig.cpp
+@@ -1,3 +1,4 @@
++#include <boost/filesystem.hpp>
+ #include "libslic3r/libslic3r.h"
+ #include "libslic3r/Utils.hpp"
+ #include "AppConfig.hpp"
+diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
+index 35e36c0..5e8059b 100644
+--- a/src/libslic3r/AppConfig.hpp
++++ b/src/libslic3r/AppConfig.hpp
+@@ -5,6 +5,7 @@
+ #include <map>
+ #include <string>
+ 
++#include <boost/filesystem/path.hpp>
+ #include <boost/algorithm/string/trim_all.hpp>
+ 
+ #include "libslic3r/Config.hpp"
+diff --git a/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp
+index 269c1cb..acea297 100644
+--- a/src/libslic3r/Flow.cpp
++++ b/src/libslic3r/Flow.cpp
+@@ -6,6 +6,7 @@
+ #include <assert.h>
+ 
+ #include <boost/algorithm/string/predicate.hpp>
++#include <boost/algorithm/string/replace.hpp>
+ 
+ // Mark string for localization and translate.
+ #define L(s) Slic3r::I18N::translate(s)
+diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp
+index 132c9a7..c311d05 100644
+--- a/src/libslic3r/GCode/WipeTower.cpp
++++ b/src/libslic3r/GCode/WipeTower.cpp
+@@ -12,7 +12,9 @@
+ #include "LocalesUtils.hpp"
+ #include "Flow.hpp"
+ 
++
+ #include <boost/algorithm/string/predicate.hpp>
++#include <boost/algorithm/string.hpp>
+ 
+ 
+ namespace Slic3r
+diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
+index 5bf5205..7b87052 100644
+--- a/src/libslic3r/LocalesUtils.cpp
++++ b/src/libslic3r/LocalesUtils.cpp
+@@ -1,3 +1,4 @@
++#include <boost/lexical_cast.hpp>
+ #include "LocalesUtils.hpp"
+ 
+ #ifdef _WIN32
+diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
+index 106f26e..c81cd1d 100644
+--- a/src/libslic3r/Preset.cpp
++++ b/src/libslic3r/Preset.cpp
+@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
+ VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
+ {
+     ptree tree;
+-    boost::filesystem::ifstream ifs(path);
++    boost::nowide::ifstream ifs(path.string());
+     boost::property_tree::read_ini(ifs, tree);
+     return VendorProfile::from_ini(tree, path, load_all);
+ }
+diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
+index f525c98..839f0f5 100644
+--- a/src/libslic3r/Utils.hpp
++++ b/src/libslic3r/Utils.hpp
+@@ -7,6 +7,7 @@
+ #include <type_traits>
+ #include <system_error>
+ 
++#include <boost/filesystem.hpp>
+ #include <boost/system/error_code.hpp>
+ 
+ #include "libslic3r.h"
+diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
+index cef390f..553a183 100644
+--- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
++++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
+@@ -18,6 +18,11 @@
+ #include <wx/notebook.h>
+ #include "Notebook.hpp"
+ 
++#include <boost/filesystem.hpp>
++#include <boost/property_tree/ptree.hpp>
++#include <boost/property_tree/ini_parser.hpp>
++#include <boost/log/trivial.hpp>
++
+ #include "MainFrame.hpp"
+ #include "wxExtensions.hpp"
+ 
+diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+index fcb7472..866ebae 100644
+--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
++++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+@@ -14,6 +14,7 @@
+ #include <boost/log/trivial.hpp>
+ #include <boost/dll/runtime_symbol_info.hpp>
+ #include <boost/algorithm/string/replace.hpp>
++#include <boost/nowide/fstream.hpp>
+ 
+ #include <wx/filename.h>
+ #include <wx/stattext.h>
+@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
+ 
+ } // namespace GUI
+ } // namespace Slic3r
+-#endif // __linux__
+\ No newline at end of file
++#endif // __linux__
+diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
+index d519626..a14fb61 100644
+--- a/src/slic3r/GUI/FreeCADDialog.cpp
++++ b/src/slic3r/GUI/FreeCADDialog.cpp
+@@ -38,6 +38,7 @@
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#include <boost/nowide/fstream.hpp>
+ 
+ // hack for process.hpp : it uses pid_t to set it as alias of int, but vc_x64_lib (wx thingy) as a '#define pid_t int'
+ // and so boost/process has a line 'typedef int int'instead of 'typedef int pid_t' that makes it crash
+@@ -322,7 +323,7 @@ bool FreeCADDialog::load_text_from_file(const boost::filesystem::path &path) {
+         try {
+             std::locale loc = boost::locale::generator()("en_US.UTF-8");
+             // Open the stream to 'lock' the file.
+-            boost::filesystem::ifstream in;
++            boost::nowide::ifstream in;
+             in.imbue(loc);
+             in.open(path);
+             // Obtain the size of the file.
+@@ -369,7 +370,7 @@ bool FreeCADDialog::write_text_in_file(const wxString &towrite, const boost::fil
+         boost::filesystem::create_directories(file.parent_path());
+         std::locale loc = boost::locale::generator()("en_US.UTF-8");
+         // Open the stream to 'lock' the file.
+-        boost::filesystem::ofstream out;
++        boost::nowide::ofstream out;
+         out.imbue(loc);
+         out.open(file);
+         out << towrite;
+diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
+index 2f32d04..813ef1c 100644
+--- a/src/slic3r/GUI/GUI_App.cpp
++++ b/src/slic3r/GUI/GUI_App.cpp
+@@ -19,6 +19,7 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/nowide/convert.hpp>
++#include <boost/nowide/fstream.hpp>
+ 
+ #include <wx/stdpaths.h>
+ #include <wx/imagpng.h>
+diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index dbedd0a..25182cc 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+ 
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+ 
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+-	boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++	boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ 	cereal::BinaryOutputArchive archive(file);
+ 		HintsCerealData cd { ids };
+ 	try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ 		BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ 		return;
+ 	}
+-	boost::filesystem::ifstream file(path);
++	boost::nowide::ifstream file(path.string());
+ 	cereal::BinaryInputArchive archive(file);
+ 	HintsCerealData cd;
+ 	try
+diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
+index ffc600b..c8080d1 100644
+--- a/src/slic3r/GUI/Preferences.cpp
++++ b/src/slic3r/GUI/Preferences.cpp
+@@ -12,6 +12,7 @@
+ #include "OG_CustomCtrl.hpp"
+ #include "wxExtensions.hpp"
+ 
++#include <boost/algorithm/string/split.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/path.hpp>
+ 
+diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
+index 87bef23..d097d58 100644
+--- a/src/slic3r/GUI/PrintHostDialogs.cpp
++++ b/src/slic3r/GUI/PrintHostDialogs.cpp
+@@ -81,8 +81,8 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
+     if (size_t extension_start = recent_path.find_last_of('.'); extension_start != std::string::npos)
+         m_valid_suffix = recent_path.substr(extension_start);
+     // .gcode suffix control
+-    auto validate_path = [this](const wxString &path) -> bool {
+-        if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
++    auto validate_path = [this](const std::wstring &path) -> bool {
++        if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) {
+             MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
+             if (msg_wingow.ShowModal() == wxID_NO)
+                 return false;
+@@ -92,7 +92,7 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
+ 
+     auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
+     btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-        if (validate_path(txt_filename->GetValue())) {
++        if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+             post_upload_action = PrintHostPostUploadAction::None;
+             EndDialog(wxID_OK);
+         }
+@@ -102,7 +102,7 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
+     if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
+         auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
+         btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-            if (validate_path(txt_filename->GetValue())) {
++            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+                 post_upload_action = PrintHostPostUploadAction::StartPrint;
+                 EndDialog(wxID_OK);
+             }
+@@ -113,7 +113,7 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path, PrintHostPostUplo
+         // Using wxID_MORE as a button identifier to be different from the other buttons, wxID_MORE has no other meaning here.
+         auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and Simulate"));
+         btn_simulate->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-            if (validate_path(txt_filename->GetValue())) {
++            if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+                 post_upload_action = PrintHostPostUploadAction::StartSimulation;
+                 EndDialog(wxID_OK);
+             }        
+diff --git a/src/slic3r/GUI/ScriptExecutor.cpp b/src/slic3r/GUI/ScriptExecutor.cpp
+index e923bb5..354c79b 100644
+--- a/src/slic3r/GUI/ScriptExecutor.cpp
++++ b/src/slic3r/GUI/ScriptExecutor.cpp
+@@ -4,6 +4,13 @@
+ #include "Tab.hpp"
+ #include "libslic3r/PresetBundle.hpp"
+ #include "libslic3r/Print.hpp"
++#include <boost/log/trivial.hpp>
++#include <boost/lexical_cast.hpp>
++#include <boost/algorithm/string/trim_all.hpp>
++#include <boost/algorithm/string/erase.hpp>
++#include <boost/algorithm/string/split.hpp>
++#include <boost/filesystem.hpp>
++#include <boost/filesystem/string_file.hpp>
+ 
+ #include <string>
+ 
+diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
+index 340369e..837982e 100644
+--- a/src/slic3r/GUI/Tab.cpp
++++ b/src/slic3r/GUI/Tab.cpp
+@@ -36,6 +36,8 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/lexical_cast.hpp>
++#include <boost/nowide/fstream.hpp>
++#include <boost/log/trivial.hpp>
+ 
+ #include "wxExtensions.hpp"
+ #include "PresetComboBoxes.hpp"
+@@ -1701,7 +1703,7 @@ std::vector<Slic3r::GUI::PageShp> Tab::create_pages(std::string setting_type_nam
+ 
+     //read file
+     //std::ifstream filestream(ui_layout_file.c_str());
+-    boost::filesystem::ifstream filestream(ui_layout_file);
++    boost::nowide::ifstream filestream(ui_layout_file);
+     std::string full_line;
+     while (std::getline(filestream, full_line)) {
+         //remove spaces
+diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp
+index 62461cd..7a02c04 100644
+--- a/src/slic3r/Utils/Http.cpp
++++ b/src/slic3r/Utils/Http.cpp
+@@ -11,6 +11,7 @@
+ #include <boost/filesystem.hpp>
+ #include <boost/format.hpp>
+ #include <boost/log/trivial.hpp>
++#include <boost/nowide/fstream.hpp>
+ 
+ #include <curl/curl.h>
+ 
+@@ -52,7 +53,7 @@ namespace Slic3r {
+ 						% error;
+ 			})
+ 			.on_complete([&](std::string body, unsigned /* http_status */) {
+-				boost::filesystem::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
++				boost::nowide::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
+ 				file.write(body.c_str(), body.size());
+ 				file.close();
+ 				boost::filesystem::rename(tmp_path, target_path);
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-cereal.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-cereal.patch
new file mode 100644
index 000000000000..2013e08cf032
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-cereal.patch
@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 18f26ba..c0a1f1f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -468,6 +468,9 @@ endif ()
+ 
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++if (NOT TARGET cereal::cereal)
++    add_library(cereal::cereal ALIAS cereal)
++endif ()
+ 
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7b2defe..f63aaad 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -141,7 +141,7 @@ if (NOT WIN32)
+     set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
+ endif ()
+ 
+-target_link_libraries(Slic3r libslic3r cereal)
++target_link_libraries(Slic3r libslic3r cereal::cereal)
+ 
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 0ab5584..36917f3 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -416,7 +416,7 @@ find_package(JPEG REQUIRED)
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index c11f860..4ca2523 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -302,7 +302,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
+ 
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-dont-install-angelscript.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-dont-install-angelscript.patch
new file mode 100644
index 000000000000..f8e89fcd08fa
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-dont-install-angelscript.patch
@@ -0,0 +1,13 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f63aaad..ba2fe01 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -28,7 +28,7 @@ if (SLIC3R_GUI)
+     include_directories(hidapi/include)
+     add_subdirectory(exif)
+     include_directories(exif/include)
+-    add_subdirectory(angelscript)
++    add_subdirectory(angelscript EXCLUDE_FROM_ALL)
+     # include_directories(angelscript/include)
+ 
+     if(WIN32)
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch
new file mode 100644
index 000000000000..2fc6ca2730e8
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-gcodeviewer-symlink-fix.patch
@@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ba2fe01..b84292b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -300,5 +300,5 @@ else ()
+     install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ 
+     # Install the symlink for gcodeviewer
+-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
++    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ endif ()
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch
new file mode 100644
index 000000000000..289198863367
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-missing-includes-fix.patch
@@ -0,0 +1,74 @@
+diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
+index a626986..5f2d963 100644
+--- a/src/libslic3r/AppConfig.cpp
++++ b/src/libslic3r/AppConfig.cpp
+@@ -1,6 +1,7 @@
+ #include <boost/filesystem.hpp>
+ #include "libslic3r/libslic3r.h"
+ #include "libslic3r/Utils.hpp"
++#include "libslic3r/I18N.hpp"
+ #include "AppConfig.hpp"
+ #include "Exception.hpp"
+ #include "LocalesUtils.hpp"
+diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp
+index 1c54588..c74df3a 100644
+--- a/src/libslic3r/ExtrusionEntity.hpp
++++ b/src/libslic3r/ExtrusionEntity.hpp
+@@ -9,6 +9,8 @@
+ #include <string_view>
+ #include <numeric>
+ 
++#include "Config.hpp"
++
+ namespace Slic3r {
+ 
+ class ExPolygonCollection;
+diff --git a/src/libslic3r/Geometry/ArcFitter.cpp b/src/libslic3r/Geometry/ArcFitter.cpp
+index 34ef2ae..20fe8b7 100644
+--- a/src/libslic3r/Geometry/ArcFitter.cpp
++++ b/src/libslic3r/Geometry/ArcFitter.cpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cmath>
+ #include <cassert>
++#include "Polyline.hpp"
+ 
+ namespace Slic3r { namespace Geometry {
+ 
+diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp
+index 34ec4e6..ed83b3e 100644
+--- a/src/libslic3r/PerimeterGenerator.hpp
++++ b/src/libslic3r/PerimeterGenerator.hpp
+@@ -1,6 +1,7 @@
+ #ifndef slic3r_PerimeterGenerator_hpp_
+ #define slic3r_PerimeterGenerator_hpp_
+ 
++#include "ClipperUtils.hpp"
+ #include "libslic3r.h"
+ #include <vector>
+ #include "ExPolygonCollection.hpp"
+diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
+index f69d68f..1dd55f2 100644
+--- a/src/libslic3r/Print.cpp
++++ b/src/libslic3r/Print.cpp
+@@ -18,6 +18,8 @@
+ #include "Utils.hpp"
+ #include "BuildVolume.hpp"
+ 
++#include <tbb/tbb.h>
++
+ #include <float.h>
+ 
+ #include <algorithm>
+diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
+index 553a183..686630c 100644
+--- a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
++++ b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
+@@ -40,6 +40,7 @@
+ #include <wx/odcombo.h>
+ #include <wx/textctrl.h>
+ #include <wx/wrapsizer.h>
++#include <wx/rawbmp.h>
+ #include "wxExtensions.hpp"
+ 
+ #include <boost/filesystem/path.hpp>
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-openexr3.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-openexr3.patch
new file mode 100644
index 000000000000..7bd04e6fad10
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-openexr3.patch
@@ -0,0 +1,77 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 4fde5fa..566e73a 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -347,28 +347,10 @@ macro(just_fail msg)
+   return()
+ endmacro()
+ 
+-find_package(IlmBase QUIET)
+-if(NOT IlmBase_FOUND)
+-  pkg_check_modules(IlmBase QUIET IlmBase)
+-endif()
+-if (IlmBase_FOUND AND NOT TARGET IlmBase::Half)
+-  message(STATUS "Falling back to IlmBase found by pkg-config...")
+-
+-  find_library(IlmHalf_LIBRARY NAMES Half)
+-  if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS)
+-    just_fail("IlmBase::Half can not be found!")
+-  endif()
+-  
+-  add_library(IlmBase::Half UNKNOWN IMPORTED)
+-  set_target_properties(IlmBase::Half PROPERTIES
+-    IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
+-    INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}")
+-elseif(NOT IlmBase_FOUND)
+-  just_fail("IlmBase::Half can not be found!")
+-endif()
+ find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
+ find_package(ZLIB ${_quiet} ${_required})
+ find_package(Boost ${_quiet} ${_required} COMPONENTS iostreams system )
++find_package(Imath CONFIG)
+ 
+ # Use GetPrerequisites to see which libraries this OpenVDB lib has linked to
+ # which we can query for optional deps. This basically runs ldd/otoll/objdump
+@@ -419,7 +401,7 @@ foreach(PREREQUISITE ${_OPENVDB_PREREQUISITE_LIST})
+     set(OpenVDB_USES_LOG4CPLUS ON)
+   endif()
+ 
+-  string(FIND ${PREREQUISITE} "IlmImf" _HAS_DEP)
++  string(FIND ${PREREQUISITE} "OpenEXR" _HAS_DEP)
+   if(NOT ${_HAS_DEP} EQUAL -1)
+     set(OpenVDB_USES_ILM ON)
+   endif()
+@@ -450,11 +432,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+   find_package(Log4cplus ${_quiet} ${_required})
+ endif()
+ 
+-if(OpenVDB_USES_ILM)
+-  find_package(IlmBase ${_quiet} ${_required})
+-endif()
+-
+-if(OpenVDB_USES_EXR)
++if(OpenVDB_USES_ILM OR OpenVDB_USES_EXR)
+   find_package(OpenEXR ${_quiet} ${_required})
+ endif()
+ 
+@@ -471,7 +449,7 @@ endif()
+ set(_OPENVDB_VISIBLE_DEPENDENCIES
+   Boost::iostreams
+   Boost::system
+-  IlmBase::Half
++  Imath::Imath
+ )
+ 
+ set(_OPENVDB_DEFINITIONS)
+@@ -481,10 +459,7 @@ endif()
+ 
+ if(OpenVDB_USES_EXR)
+   list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
+-    OpenEXR::IlmImf
++    OpenEXR::OpenEXR
+   )
+   list(APPEND _OPENVDB_DEFINITIONS "-DOPENVDB_TOOLS_RAYTRACER_USE_EXR")
+ endif()
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch
new file mode 100644
index 000000000000..1ea699ebff5a
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-relax-OpenCASCADE-dep.patch
@@ -0,0 +1,13 @@
+diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
+index ed75531..16de4e0 100644
+--- a/src/occt_wrapper/CMakeLists.txt
++++ b/src/occt_wrapper/CMakeLists.txt
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+ 
+ generate_export_header(OCCTWrapper)
+ 
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+     TKXDESTEP
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-wxgtk3-wayland-fix.patch b/media-gfx/superslicer/files/superslicer-2.5.59.2-wxgtk3-wayland-fix.patch
new file mode 100644
index 000000000000..6111a25cbf2c
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-wxgtk3-wayland-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
+index ccd3cc0..be8bbe5 100644
+--- a/src/slic3r/GUI/GUI.cpp
++++ b/src/slic3r/GUI/GUI.cpp
+@@ -33,6 +33,16 @@ class AppConfig;
+ 
+ namespace GUI {
+ 
++// wxgtk3 is broken on wayland: https://trac.wxwidgets.org/ticket/17702
++#ifdef __WXGTK3__
++struct ForceX11 {
++    ForceX11() {
++        setenv("GDK_BACKEND", "x11", 1);
++    }
++};
++static struct ForceX11 forcex11;
++#endif
++
+ #if __APPLE__
+ IOPMAssertionID assertionID;
+ #endif
diff --git a/media-gfx/superslicer/superslicer-2.5.59.2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2.ebuild
new file mode 100644
index 000000000000..304f0fbf199c
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.5.59.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+MY_PN="SuperSlicer"
+
+inherit cmake wxwidgets xdg flag-o-matic
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer/"
+SRC_URI="
+	https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/slic3r/slic3r-profiles/archive/f6b1b123062a77101fe350f6d2a2a57be9adc684.tar.gz -> ${P}-profiles.tar.gz
+"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+# No dep on sci-libs/libigl, in-tree version cannot build
+# static library currently. Using bundled one.
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb:=
+	dev-libs/boost:=[nls]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/gmp:=
+	dev-libs/mpfr:=
+	dev-libs/imath:=
+	>=media-gfx/openvdb-8.2:=
+	net-misc/curl[adns]
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/opengl
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost.patch"
+	"${FILESDIR}/${P}-cereal.patch"
+	"${FILESDIR}/${P}-dont-install-angelscript.patch"
+	"${FILESDIR}/${P}-gcodeviewer-symlink-fix.patch"
+	"${FILESDIR}/${P}-missing-includes-fix.patch"
+	"${FILESDIR}/${P}-openexr3.patch"
+	"${FILESDIR}/${P}-wxgtk3-wayland-fix.patch"
+	"${FILESDIR}/${P}-relax-OpenCASCADE-dep.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+
+	mv slic3r-profiles-*/* "${S}"/resources/profiles/ || die
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="Release"
+
+	append-flags -fno-strict-aliasing
+
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
+
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=ON
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_STATIC=OFF
+		-DSLIC3R_WX_STABLE=ON
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm "${ED}/usr/lib/udev/rules.d/90-3dconnexion.rules" || die
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6f7f22592b3a..004149e1cf82 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libdiscid/Manifest b/media-libs/libdiscid/Manifest
index b791b3a8ef7a..09e1fa382816 100644
--- a/media-libs/libdiscid/Manifest
+++ b/media-libs/libdiscid/Manifest
@@ -1,3 +1,3 @@
 DIST libdiscid-0.6.4.tar.gz 393070 BLAKE2B 19f98f7f84eb992f8e42300161c2b90a967e002e2e99c033feb50d551245c14299079c1564dba628ccc4067c377db758711d00a581f7d6c6c02ac7a5724d6cc3 SHA512 36a25ea3b3c009dba53623211e3858209318c1dc5526d1a27c7bf39ce765651de7f93ab6a43650fe4fe5d69b3f3c622f457d992dcc5e746263f0cbcb150b1ceb
-EBUILD libdiscid-0.6.4.ebuild 600 BLAKE2B 00e1a9dc6b6a399c229da741c81a7174a238b927942f5746142b858b34ae48dacd550a46b71938926dcd2277d103315cec507e59c2f862e5bb63533a60f0f2fb SHA512 f5a7cdb32ed53ad00ba018c0b4a2d5239356617365e4a8e06dd249a43b38fbda0f29a7c61829683bf88442a392e4239a2b01ab32a866198d3fb08692a90f2174
+EBUILD libdiscid-0.6.4.ebuild 607 BLAKE2B 860c03b125c0d244025ab21941e39ae7d3c54fba2cca27ee5f728ead83876bbe53ed5f2733e30c1bf1ea501c3e7a504de77f08979f6f04ea0b83265006c350c9 SHA512 f555f067cbeaf6d76a7fffe8d8fbbfbe76a19ef6f406b4a11e69576e51a729d8f7c26dc95c6be3b22823a84af7f7e67657131982cdfd933300f188929645871a
 MISC metadata.xml 588 BLAKE2B fd4496362fde7a6f1a7c7ae74ddae9e52d1037d01d35660edb695f863491fa34ac001c32114525115730451a83fdd81d46a70c369df112ecfe0fc2f58cf5fc42 SHA512 adc9c5d0d91f0902df19f9dd3360ad6588dcc7aee37beee25e10c2cc50e27f7a500034c47e932621c7ff1c1f3741bc8633fa9d29598d6f39e309ffcbb9040f2c
diff --git a/media-libs/libdiscid/libdiscid-0.6.4.ebuild b/media-libs/libdiscid/libdiscid-0.6.4.ebuild
index 65d2ff93748d..1e8b73cee0ea 100644
--- a/media-libs/libdiscid/libdiscid-0.6.4.ebuild
+++ b/media-libs/libdiscid/libdiscid-0.6.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/media-libs/libofa/Manifest b/media-libs/libofa/Manifest
index b84a21ee272f..3e9d8d525b37 100644
--- a/media-libs/libofa/Manifest
+++ b/media-libs/libofa/Manifest
@@ -3,5 +3,5 @@ AUX libofa-0.9.3-gcc-4.4.patch 251 BLAKE2B 89e4dbfb168e528a753e7c114f8568411a2c5
 AUX libofa-0.9.3-gcc-4.7.patch 651 BLAKE2B 52a20e9242f5899ad0c08b91ae2d9169642ceb51b87a22ddc0ca641f57f1ae6a342d3b658265caf1d1d3b938fc13b3b717c118839adbcf3e10a78d35cf68827c SHA512 ec337bb839ef2b7477cc4a5c45cf751c1d0371898591865725fe6db05ab25fd8c0297ecbe44d1157b2de56d9bf7284634c668cf5b72ff03a7dca66dba8d99522
 AUX libofa-0.9.3-gcc-4.patch 818 BLAKE2B c49d0f1bc2c364a25c20792ad79d53a5a8abdc9370c272e4159c5a37844061cbc03aecf97933d0c2e2c4b18225d004fb0484456169f78f5caee0fa5ae5a1145b SHA512 7e80ddb700da74d1e2b6c5e65588e6329e8ae231534b3d74b98815bc4919964a9fad87fcdfa2bef0d4adf9d478efd5c1649d018fb347a93c7ae1685cccab8834
 DIST libofa-0.9.3.tar.gz 384043 BLAKE2B 1b4c89e1a26e3bec1b2bde16c5d2c86ae7a66cbe8e450b96974ffd8be434062ccf21779c0eed5a809012a419d65f9de327c6b94fe6ac5365270fe382dbfa2c08 SHA512 058fb43ea296325d2f7ad1762e1fd3f2ad772754b5d53dbaa1c5cd91ac5041ef82c7ea9ac580825e2391fa7db6803ff7fd5b24faf319280211a4641516126967
-EBUILD libofa-0.9.3-r3.ebuild 1233 BLAKE2B 69e51b6f8c7274f513d7d40fcaa2e7fa30d51c50bc85164cd0314ac9f2b8df0d2d45761edada05ac5117b32d07d09e1b48d2e541bca84b9c7493cdc1dfbd6fd5 SHA512 067f1703169b87a0dfef9de10e01290bd640080fe7ab05786d4e48c300e677228f2e8fd8576f4d091c4b27b3f7e4fa745f1bdbb6df909df549a104e3f998c3e9
+EBUILD libofa-0.9.3-r3.ebuild 1240 BLAKE2B 2d0303fde9eb49f626402d7387be3501285ff9cabf5bc1f4dc0e060181b3a85ab9172a19d11668003f4c076c54f6943f63f445ad147ed97c9de2f9dba0e9ed0e SHA512 1b08767bca56c2ef6dfbcf67a3cb366f6cb64bf2ba3b96deb98d74cf356f44cce11972241129ffb669626b25455d38b1d0cfad93852b5ea7c1cc1d1d1f3b066f
 MISC metadata.xml 338 BLAKE2B cc10ec41e61bb68cd0323b721e96f3cd3bb542b9e0b2c8e2a738b0d7bcd250ede90d085e9b399eec501a33b0b669962d8c6ee1a3a6e9cf04d67e3437e631e9ad SHA512 9a87b6850749089f0a6b3c79fb777f5ca344311b047e7f1bde29f851f4cba6c87c3f2796c3bdec8487bd80e71bdb07713c53fce9c8425d5caa255f0c893002fc
diff --git a/media-libs/libofa/libofa-0.9.3-r3.ebuild b/media-libs/libofa/libofa-0.9.3-r3.ebuild
index f991500d7892..2867470a724c 100644
--- a/media-libs/libofa/libofa-0.9.3-r3.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://musicip-libofa.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( APL-1.0 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND=">=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest
index a0761a0a794d..d78c931afa12 100644
--- a/media-libs/libvisual/Manifest
+++ b/media-libs/libvisual/Manifest
@@ -2,5 +2,5 @@ AUX libvisual-0.4.0-better-altivec-detection.patch 1555 BLAKE2B 8516652c13c365ba
 DIST libvisual-0.4.1.tar.bz2 560877 BLAKE2B 5429493424cbf7d5d6e17ef6a5219ffb5491a6e0f7ea9d9563021beabfdc22aead0d80924c17904b96cc645ef0dc737fa61680abf152b421ca5f4ac834fc6a19 SHA512 a1417a54d4f0566121db5d08770e7f41559ef7f3704d0da74f1dc316c6b7f16197d843a96382b4122d01251764ccb6ed240fd4e99abc7b0f440c9f43afa9506a
 DIST libvisual-0.4.2.tar.bz2 563023 BLAKE2B b9480db0f168f6e7b398f773c6bbf4d1dab75dd2b711cc9b0b5fd1fb790e57cdd1e9ed3733fb4f911586b7ebb6e1cb9f3bbe74bfe4e67b9cb95e3e7b2eee950a SHA512 88634c27cd5de149d08141fb68d86a85320513208426f412541ab6aa985069683c17437fd0f49d6dafdd811a516f1f9268a2cf2146a3b55332280d7930f59b55
 EBUILD libvisual-0.4.1.ebuild 1098 BLAKE2B 2053824d6e2a30049c9008898547f3fe720b2d011ddc204fd2defdbc74cec2aa80a1f25c76603155f855a14b57df6bfc01bf5c8eabd76f0525e6cadf2a6c976b SHA512 847574b94af1f236b654c1019b311dc2d7f9079f0a2504a7b440e92a0856db060702f91707d42a584477d2e65ab404a8a3f78636ad728e30f31ea79bdfb5c46c
-EBUILD libvisual-0.4.2.ebuild 1205 BLAKE2B 4bf88e8bec04fd92119aeb7c34b83aaf8a4dbd34c6d7761d13ea7ef2e1429125700ce963990a5b56d85b6b1a34805fe9288b351cf38914094edf0c3b7fc4d14c SHA512 256ae6e7a4662e17770cb404c11fd50a11fa0e8dd9997a3bad942b34742f9c45af3663ed0f4b24a3a7390aefb8548819d81c1109bd777fae80ffc8e0903adc3e
+EBUILD libvisual-0.4.2-r1.ebuild 1220 BLAKE2B 5d9f9f5d56a613f9987be4e08c21018f233112cba73e12e46a7d560ab2f4083e006b10cf351639c02497eb4a0e5c62d683f3148bd2afcbe07dc093edd1bf0a0c SHA512 29e4cb8eb6b991471294207ed5a073577d01a010bf3ed213328c271103141cc9fd0f8352b9276eb40ab84f7d4dc68ba15428446ffcc138f76285e2282f4b7157
 MISC metadata.xml 502 BLAKE2B cdca87d3e30a985550bf0ae3d922a07670553d360128283d789adbf4584d0d3fa5ae339e52901a8e16c5e1650b6414e5f260aca841957f2ed124e7c437c29a14 SHA512 da4595d0e3dc330fabf03183ae7233323eea087b8e4daeb336d6d2e1ee84156d0639a74b41fe742147477442ab5fef2e51c1cf56e06cdba2647f97f0964bf2cd
diff --git a/media-libs/libvisual/libvisual-0.4.2.ebuild b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild
similarity index 88%
rename from media-libs/libvisual/libvisual-0.4.2.ebuild
rename to media-libs/libvisual/libvisual-0.4.2-r1.ebuild
index d79d98ed8917..6102eb3acd91 100644
--- a/media-libs/libvisual/libvisual-0.4.2.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild
@@ -11,13 +11,13 @@ SRC_URI="https://github.com/Libvisual/libvisual/releases/download/${P}/${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="debug nls threads"
 
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
-DEPEND="media-libs/libsdl"
+DEPEND="media-libs/libsdl[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index b9c33904861e..18b1696d6fb3 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,7 @@
 AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 AUX opus-1.3.1-macro-wstrict-prototypes.patch 469 BLAKE2B a68a9506ee1d3c08f0106f9270e6d4132f15b23434f844a9b33b8326590687d6ecaaa91b21cbc921b03f0aa5d2bfcd004a276099c19fe25ded6dc25b28093f50 SHA512 9467be13f0c0c9fcc1026830d206738871a97b2005ad540c5286112c0921051f995e475ebf4e1701b2fce7dfb2c8dfedd2a7bb1d54dfb7b623433ae98b71a9ca
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
+DIST opus-1.4.tar.gz 1063408 BLAKE2B 21f11df745cb868f4da1586d678901045fd9bd0c0590628015f3adc2522c88b0660df88096abe975051fec3188b76b93762c4a01907c2ab2b23c40fde79cf6ad SHA512 1ecd39e0add24de12823bf7c936bb67441228721e2cdae0edbfcf3cee0894bcc6edf2a1d0ca5cdfdad1565803bf39cc4c985ad32710c2a9582f850adeb5ca631
 EBUILD opus-1.3.1-r4.ebuild 1396 BLAKE2B 61734d61d0f4a2cc973821e3ebfcda2ed0d9ac96a4550512b71408472408eddbbbe5fd0027434a151388d06b14845270d102dbf72c1116b928b400e6bbc1d099 SHA512 31e110ab734cfbd63d364f3891421ff44188be244b7f5a29f3c941259bb945032b1a9617290b9b7eaec142118cf77d34443258eaae05bec09afc441c2f630ed3
+EBUILD opus-1.4.ebuild 1496 BLAKE2B fcf6ac170a88f7d02dc6b61fafa7ff692ee98ffc80255dc8021d16a85e48e3f5dc1264cd098761c25f16fe8370713760f9ec0695e3ee12a96734a5811d61f633 SHA512 5c966ea9007d37eff2f1747f950ed50a51ed1b639a7108757ca504d69976d41f79cabfc4c1fc64aa1ff0a1dc55e25d2ec39bab5dfb291266ce40d196854344d2
 MISC metadata.xml 538 BLAKE2B d65f695f3bf53cb827c9fbfc621cb58f3465e77f74f3bb3c436fc8741161798b6f7dc3381a07e21f7f1e5310104ed89179c64d9ab30f2102c76ef6ee73ad9ebc SHA512 0e84eba3a3711486a9569e7d38b0fe7cd11aa0d68c123f3304b6b698394dff4e48f4270624793cdc17a16a3ac8c9f921ae50bcbb30b920916b4bad9ae60c7117
diff --git a/media-libs/opus/opus-1.4.ebuild b/media-libs/opus/opus-1.4.ebuild
new file mode 100644
index 000000000000..eee6a69ff2cf
--- /dev/null
+++ b/media-libs/opus/opus-1.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic meson-multilib
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://github.com/xiph/opus/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes debug doc hardened static-libs test ${INTRINSIC_FLAGS}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.1-libdir-macro.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
+
+		$(meson_use custom-modes)
+		$(meson_feature test tests)
+		$(meson_use debug assertions)
+		$(meson_use hardened hardening)
+
+		$(meson_native_use_feature doc docs)
+
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	local i
+	# We want to disable intrinsics if no flags are enabled
+	# (This is a fun Bash construct to do that!)
+	# bug #752069
+	# TODO: What is -Dasm for?
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && emesonargs+=( -Dintrinsics=enabled ) && break
+	done || emesonargs+=( -Dintrinsics=disabled )
+
+	if is-flagq -ffast-math || is-flagq -Ofast ; then
+		emesonargs+=( -Dfloat-approx=true )
+	fi
+
+	meson_src_configure
+}
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index d9b59050f5f3..a2b6e6490658 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,10 +1,7 @@
-AUX rubberband-3.1.1-build.patch 6812 BLAKE2B bbc737c3721fcecbe133acda980c31d90fd0009d697e5dfdbdc38ab47bc381ce8ce65bbde011a6974f363c69fe33b22daf6a8d4a950b113dc905e5fce9b01465 SHA512 d6bfd803cdead6b1b744bc980258e8e41752ea3e2caeb8a6b8ccba0b1d1ddee3cdb5d580a13ee4316dc26310b3fed4dc11e832e55371624c7ba0676518089158
-DIST rubberband-3.1.1.tar.bz2 217586 BLAKE2B 17f616eab563f0949dc89103775dac2c932b8ade79e7445524c87d9ced46ecd30d9cff53960e2638ce571c1f6ddbc9ad50e7371900b96eb0ec22c58cc80e585e SHA512 240ad6cd486f975099f76c6ac8bcf34add45670f58164089ffc9767ebef4c7dfdd7e58ad0c3d99a96f56af0d1f7669e55c5fc3e79277357c62fba21cb3bfe4cd
 DIST rubberband-3.1.2.tar.bz2 218361 BLAKE2B 26d2850adea8b564e49ce1eb24abcd9cd83d20a5eda6bcfc1254b3357a0e720b04faa9e9f2de769b65f6449afe138de9051505f745f69a73cc1275786029838c SHA512 b21605a0cf882e34fc2eada38a446220257e4b067475e36dfeef00d491425ad51398fbb49773dbd162683531b70f7c864ab02bff744d7e0dde7ed1d64aa1d327
 DIST rubberband-3.1.3.tar.bz2 218532 BLAKE2B edc9ada6a67af2b45f15a6240b46d77830068595f5b873b50b55e91be29abc30600025713e7bd84e99d05ea1d0fcdb36873cbf966b00d7e805cfea99a4462e1d SHA512 c7e42020c543b1741e1d3e7ad79f92081177953f63a8b7b1c302a185cb7a0b828d9519e03a6df39c1cff356b324370313501df54bc74be32dcdb955c789b6485
 DIST rubberband-3.2.1.tar.bz2 221756 BLAKE2B 6b2bb540037495892907285561982b2f87affa60b6ad84315654e92f3321be097dfc23fec9dde6eb9e3a7a3e38d6e3126f683dc88f442845722f321ddeb8c24d SHA512 c2278d874ebaeafa2ff6be4bdd3dea40235debce7ced8b93f1b73a93b5796b77ee5f6024cb539776f11bd936c2f100c084d7e91c006e81c1e6f3cf5eff602cbf
-EBUILD rubberband-3.1.1-r1.ebuild 1777 BLAKE2B 006f2b1e51b9445703d547d8a8bbf5c0b793ab824738bbf9274b4b7acaf11b982f6bf52db67e982359c8b8456927d2a320889faefde2e92b6de8f3b9a0a95a28 SHA512 e42edbfa26c594a74acdf6230fc6f60fe7b4c928c698216e327c1528039c4c6238d69dd79c227ad3211ab96ea981e94ba67dd185bcbb407db5aada1b8d4d5e75
-EBUILD rubberband-3.1.2.ebuild 2433 BLAKE2B cf669664027b15cf972e5a500adce631e7dbeaba4ac8aaf59eeb3434c285f45fe31fee8a052fbb182e7d061d2ecc1d3cab91a960c6853c488117018c38cd6e7e SHA512 4abfae1b4fdcc8ecb23358e30968529525f910d0f05540270e5ada1b0d1eca179e27d105a042f892203ac8b0d440861cb2c4660d6b382e518516b5332088f2d7
+EBUILD rubberband-3.1.2.ebuild 2427 BLAKE2B e9f5ab31106e27cd132d71a7d7736d1656fd991c9d8b3da13e8e09074d7cfa70556feabcf4601827e6b061ae27ac2d5ad63e7bb785b1cc660fa1ff1ec2b06339 SHA512 916d3e687b46cbd5a4298fa46fc971ef3157f5b67ed05b81f837d72015eb278e2598e78d82e7d796d5f580acfa4e13a4b9766fb81f1b2e19aac516443cd05fae
 EBUILD rubberband-3.1.3.ebuild 2433 BLAKE2B cf669664027b15cf972e5a500adce631e7dbeaba4ac8aaf59eeb3434c285f45fe31fee8a052fbb182e7d061d2ecc1d3cab91a960c6853c488117018c38cd6e7e SHA512 4abfae1b4fdcc8ecb23358e30968529525f910d0f05540270e5ada1b0d1eca179e27d105a042f892203ac8b0d440861cb2c4660d6b382e518516b5332088f2d7
 EBUILD rubberband-3.2.1.ebuild 2433 BLAKE2B cf669664027b15cf972e5a500adce631e7dbeaba4ac8aaf59eeb3434c285f45fe31fee8a052fbb182e7d061d2ecc1d3cab91a960c6853c488117018c38cd6e7e SHA512 4abfae1b4fdcc8ecb23358e30968529525f910d0f05540270e5ada1b0d1eca179e27d105a042f892203ac8b0d440861cb2c4660d6b382e518516b5332088f2d7
 MISC metadata.xml 542 BLAKE2B 3a2847c1efdc85bd471215d4ab69c44a8e209e701de1d3aece7c1800dfc74107d6c93ea5736a3587a23146f2ed4a8a58f0829c305db9c32aebf92b9bfc8dff46 SHA512 852f9c71e2bce0df67a5a45bd7833472abc6e66dabe149a5a22938a0aef5c29477f2545d03fff5fe39e5eee14a21d30d0e7fcb7597f0b05c7570a0abf9265b54
diff --git a/media-libs/rubberband/files/rubberband-3.1.1-build.patch b/media-libs/rubberband/files/rubberband-3.1.1-build.patch
deleted file mode 100644
index 9dce52ec5e03..000000000000
--- a/media-libs/rubberband/files/rubberband-3.1.1-build.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -117,12 +117,18 @@ sleef_dep = dependency('sleef', version: '>= 3.3.0', required: false)
- sleefdft_dep = dependency('sleefdft', version: '>= 3.3.0', required: false)
- samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
- speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', required: false)
--sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
--vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
-+if get_option('programs')
-+  sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: true)
-+endif
-+if get_option('vamp')
-+  vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: true)
-+endif
- 
- boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false)
- thread_dep = dependency('threads')
--have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+if get_option('ladspa')
-+  have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
-+endif
- have_lv2 = cpp.has_header('lv2.h', args: extra_include_args)
- have_sincos = cpp.has_function('sincos',
-                                prefix: '#define _GNU_SOURCE\n#include <math.h>',
-@@ -142,8 +148,9 @@ have_sincos = cpp.has_function('sincos',
- # language pack, optionally, and only go on to JNI if that succeeds,
- # making sure that nothing "clever" happens if Java is not found.
- #
--have_java = add_languages('java', required: false)
--if have_java
-+if get_option('jni')
-+  javac = find_program('javac', required: false)
-+  jar = find_program('jar', required: true)
-   jni_dep = dependency('jni', version: '>= 7.0.0', required: false)
-   if not jni_dep.found()
-     if cpp.has_header('jni.h', args: extra_include_args)
-@@ -370,37 +377,41 @@ if ipp_needed
-   endif
- endif # ipp_needed
- 
--if not vamp_dep.found()
--  vamp_dep = cpp.find_library('VampPluginSDK',
--                              dirs: get_option('extra_lib_dirs'),
--                              has_headers: ['vamp-sdk.h'],
--                              header_args: extra_include_args,
--                              required: false)
-+if get_option('vamp')
-   if not vamp_dep.found()
--    vamp_dep = cpp.find_library('vamp-sdk',
-+    vamp_dep = cpp.find_library('VampPluginSDK',
-                                 dirs: get_option('extra_lib_dirs'),
-                                 has_headers: ['vamp-sdk.h'],
-                                 header_args: extra_include_args,
-                                 required: false)
-+    if not vamp_dep.found()
-+      vamp_dep = cpp.find_library('vamp-sdk',
-+                                  dirs: get_option('extra_lib_dirs'),
-+                                  has_headers: ['vamp-sdk.h'],
-+                                  header_args: extra_include_args,
-+                                  required: false)
-+    endif
-   endif
-+  have_vamp = true
- endif
--have_vamp = vamp_dep.found()
- 
--if not sndfile_dep.found()
--  sndfile_dep = cpp.find_library('sndfile',
--                                 dirs: get_option('extra_lib_dirs'),
--                                 has_headers: ['sndfile.h'],
--                                 header_args: extra_include_args,
--                                 required: false)
-+if get_option('programs')
-   if not sndfile_dep.found()
--    sndfile_dep = cpp.find_library('sndfile-1',
-+    sndfile_dep = cpp.find_library('sndfile',
-                                    dirs: get_option('extra_lib_dirs'),
-                                    has_headers: ['sndfile.h'],
-                                    header_args: extra_include_args,
-                                    required: false)
-+    if not sndfile_dep.found()
-+      sndfile_dep = cpp.find_library('sndfile-1',
-+                                     dirs: get_option('extra_lib_dirs'),
-+                                     has_headers: ['sndfile.h'],
-+                                     header_args: extra_include_args,
-+                                     required: false)
-+    endif
-   endif
-+  have_sndfile = true
- endif
--have_sndfile = sndfile_dep.found()
- 
- have_boost_unit_test = boost_unit_test_dep.found()
- 
-@@ -609,7 +620,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li
-   )
- endif
- 
--if have_java and jni_dep.found()
-+if get_option('jni')
-   target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
-   message('Will build Java Native Interface')
-   rubberband_jni = shared_library(
-@@ -630,14 +641,21 @@ if have_java and jni_dep.found()
-     # NB the JNI library is not versioned
-     install: true,
-   )
--  jar('rubberband', 'com/breakfastquay/rubberband/RubberBandStretcher.java')
-+  rubberband_class = custom_target(
-+    'rubberband_class',
-+    input: 'com/breakfastquay/rubberband/RubberBandStretcher.java',
-+    output: 'RubberBandStretcher.class',
-+    command: [ javac, '@INPUT@', '-d', '@OUTDIR@' ],
-+  )
-+  rubberband_jar = custom_target(
-+    'rubberband_jar',
-+    input: rubberband_class,
-+    output: 'rubberband.jar',
-+    command: [ jar, 'cvf', '@OUTPUT@', 'com/breakfastquay/rubberband/@INPUT@' ],
-+    build_by_default: true,
-+  )
- else
-   target_summary += { 'JNI library': false }
--  if not have_java
--    message('Not building Java Native Interface: Java compiler or archiver missing')
--  else
--    message('Not building Java Native Interface: JNI header not found')
--  endif
- endif
- 
- install_headers(
-@@ -647,7 +665,7 @@ install_headers(
-   subdir: 'rubberband'
- )
- 
--if have_ladspa
-+if get_option('ladspa')
-   target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
-   message('Will build LADSPA plugin')
-   rubberband_ladspa = shared_library(
-@@ -714,7 +732,7 @@ else
-   message('Not building LV2 plugin: lv2.h header not found')
- endif
- 
--if have_vamp
-+if get_option('vamp')
-   target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
-   message('Will build Vamp plugin')
-   rubberband_vamp = shared_library(
-@@ -746,7 +764,7 @@ else
-   message('Not building Vamp plugin: Vamp dependency not found')
- endif
- 
--if have_sndfile
-+if get_option('programs')
-   message('Will build command-line utilities')
-   target_summary += { 'Command-line utility (R2)': [ true, 'Name: ' + rubberband_program_name ] }
-   rubberband_program = executable(
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -26,3 +26,18 @@ option('extra_lib_dirs',
-        value: [],
-        description: 'Additional local library directories to search for dependencies.')
- 
-+option('jni',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('ladspa',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('programs',
-+       type: 'boolean',
-+       value: 'false')
-+
-+option('vamp',
-+       type: 'boolean',
-+       value: 'false')
diff --git a/media-libs/rubberband/rubberband-3.1.1-r1.ebuild b/media-libs/rubberband/rubberband-3.1.1-r1.ebuild
deleted file mode 100644
index 3488f7ac50cd..000000000000
--- a/media-libs/rubberband/rubberband-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="https://www.breakfastquay.com/rubberband/"
-SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="ladspa jni static-libs +programs vamp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-CDEPEND="
-	media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
-	jni? ( >=virtual/jdk-1.8:* )
-	ladspa? ( media-libs/ladspa-sdk )
-	programs? ( media-libs/libsndfile )
-	vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${CDEPEND}
-	sys-devel/gcc:*
-"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-multilib_src_configure() {
-	if use ppc ; then
-		# bug #827203
-		# meson doesn't respect/use LIBS but mangles LDFLAGS with libs
-		# correctly. Use this until we get a Meson test for libatomic.
-		append-ldflags -latomic
-	elif tc-is-clang && [[ $(tc-get-cxx-stdlib) == libstdc++ ]] ; then
-		# bug #860078
-		# undefined reference to `__atomic_is_lock_free'
-		append-ldflags -latomic
-	fi
-
-	local emesonargs=(
-		--buildtype=release
-		-Dfft=fftw
-		-Dresampler=libsamplerate
-		-Ddefault_library=$(use static-libs && echo "both" || echo "shared")
-		$(meson_use ladspa)
-		$(meson_use jni)
-		$(meson_use programs)
-		$(meson_use vamp)
-	)
-	use jni && emesonargs+=(
-		-Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	! use jni && find "${ED}" -name "*.a" -delete
-}
diff --git a/media-libs/rubberband/rubberband-3.1.2.ebuild b/media-libs/rubberband/rubberband-3.1.2.ebuild
index 021e7a03c3e6..67bfcf0a42ff 100644
--- a/media-libs/rubberband/rubberband-3.1.2.ebuild
+++ b/media-libs/rubberband/rubberband-3.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="ladspa lv2 jni static-libs +programs test vamp"
 
 BDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 269175e5458f..058c92aaab41 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/libvisual-plugins/Manifest b/media-plugins/libvisual-plugins/Manifest
index f65d437493b0..f41299adf722 100644
--- a/media-plugins/libvisual-plugins/Manifest
+++ b/media-plugins/libvisual-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST libvisual-plugins-0.4.1.tar.bz2 687994 BLAKE2B 5899580c3b4f5959a5105b79565bd69d87973a38c3d860fb480d88a29846d3017b207ec318ffbd4a2e47382207ccd04cb043a99b68e76f0690cf77fa270e8722 SHA512 db80b081615e129d4bea34c7d99af1978bd1b569f4a1f17cfbbe3cadafc954085552c5944198f9c86f43aa367460d3ca5b4e4ea2aacee4f78dce9ff802a80663
 DIST libvisual-plugins-0.4.2.tar.bz2 731700 BLAKE2B 9a803c2b545fe854959043a37123089f4a215fa8139fc72a520f6cffccb004f347709ea68c273dccf60373a957ecd0aaf7ed0fd3319d431c1f65dcfe10432a95 SHA512 16015bad0a898d0990ba9d5a1fe2ab2d649b5db8b965cc00fa62b095033dc8cf27559e79cc49099b5b0a1d679f1f5f6ba9ccf2eac3ac87ebe48da2e64554a568
 EBUILD libvisual-plugins-0.4.1.ebuild 1650 BLAKE2B f938c38af3219afe5115a3ce7b2ebb0dc5baae6968ff7b0d103e82eb5ae02a9d8be3128b981fe1fc86c80aa8014c5bcacccd192c97e919a5b8054dd1bc8ad937 SHA512 f07c5943f467615453e77dc9634ba9ce9c434c7037629b73fd0477e6e31e6b47d0a7157a84efd0130307453cbd97c06a42800f6584d2364c796ab12458ca71dc
-EBUILD libvisual-plugins-0.4.2.ebuild 1894 BLAKE2B 9527b2c946b4d33379de2005d73a6a6dd1acac2ee5b8248a12883d2587646535c31c7ead9e99678d3c2e19883062a0cd3a90cde875bf5026afe882dd9dff292a SHA512 d3ba0ea886be29ee7d9e473d221c3acfe988b2b645556ca2a86442a4e0d8bf209fb1bc06099a51c1d74351f04db91e7baffc453c314030fafe4a77f6182c2563
+EBUILD libvisual-plugins-0.4.2.ebuild 1889 BLAKE2B b915c5b2663a0a5b408158c3967c80aa2ac093f2174b98b1c89165b370add0389d8d164648f0fdc4cadafdecd8db08a0f5e8daf97939249040183d631c157cc9 SHA512 b5584a549dcf561291c6c1f4454fd79b0dc3fe37fa79bfb117ef506a40c9702cec2251d44946748e293f71480fc69f46632625b0dee094f1c514791f6d469af0
 MISC metadata.xml 502 BLAKE2B cdca87d3e30a985550bf0ae3d922a07670553d360128283d789adbf4584d0d3fa5ae339e52901a8e16c5e1650b6414e5f260aca841957f2ed124e7c437c29a14 SHA512 da4595d0e3dc330fabf03183ae7233323eea087b8e4daeb336d6d2e1ee84156d0639a74b41fe742147477442ab5fef2e51c1cf56e06cdba2647f97f0964bf2cd
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild
index 00630b2e9cde..65615b6f4a2f 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Libvisual/libvisual/releases/download/${P}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gstreamer gtk jack mplayer opengl portaudio pulseaudio"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1407ea048825..f7c62ab1b609 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index a3c39f00948f..00bcf25e4b32 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -12,6 +12,6 @@ EBUILD lilypond-2.22.0-r1.ebuild 3259 BLAKE2B c8709c461436475455a836636c8bcdf54b
 EBUILD lilypond-2.22.1-r1.ebuild 3290 BLAKE2B 01d01846137ce0dceaf18f48111e017a54daf3206cd5dbd0ae0de7e2ffa93b00b4a7ddcfda9652d532ff4be45409eff60c60c883cf7d142dc825227ead8e3ae9 SHA512 96a1abf83d5a2d72f01b3b3eb85494dfe4b7b85d3150c3a83efdda5f69e4f388820be5324a9f1f47210255eb9c0754f8df7e851cf0a36400581b31f28540fbb7
 EBUILD lilypond-2.23.0-r1.ebuild 3169 BLAKE2B 045cac5a2d298d354ce29bc3c8fcbff0d2f823bda6ae8adf343769b3fa56d48d67d458b98cdd3bd1913e57c32a7473bf9d52efab3a19ef13d259904e193e34cc SHA512 be484e2cd71f4d50b124d9f07bf392e9d8bd81cd16f7591d297458d26ddc8885d6634943725b4729bbf1217fa2bfe89769ed4286e30936d4a3ff3c88ec668b2f
 EBUILD lilypond-2.23.2-r1.ebuild 3184 BLAKE2B 5e6eed86581df8a3c82ef0fff2e3ba8b5217a3c3521c376674e0e0511d287a0ba9f46bd6faa80a2c1c72002e6a31b0b94ed5d036652d766065067616e0390abc SHA512 9090401ac88a635445adeb1dd75f006aa3da92ab023eb8a810aeabe55f528d703f9e188e512ccfcc1e95af736a82c2e75521adcd0417d1797eb9a1cf88ce8461
-EBUILD lilypond-2.24.0.ebuild 2965 BLAKE2B 63aeffac904bc4224361585e44a2c677fe9f37d7d10cf925e7d64cbdf7100fec176056225440cfb06c5fef9e9e042f29fcc23c20bb1fb56756c125ea2dc8eec2 SHA512 71b1da1f89d011f09841813a1035eaf8c6752a72b9804bb031a43d21343c2f5360324677c578d21767c170705942d99897275b98beaf70a61cd03bcab1d510db
+EBUILD lilypond-2.24.0.ebuild 2962 BLAKE2B 1079f054e38b500db87f42f68c3621c3e5496fb9471fb9bdae081733a9a13497546539f12615a59ccc150ce93f23439525a78e999ec9bb7cbb17c1d23c73c209 SHA512 a27184adfb49b65d87a6fdd6f8d90cda84231f7828a5410ea5a960227459fabd860c9cec1ec7053946d72a31a7bfb4f77b4e2dbabbf7ab94811e7fc1149bdd11
 EBUILD lilypond-9999.ebuild 3143 BLAKE2B 68754245d21139e75a4638996f678860d3ec787e2140bcc73ddb5bb8e94e9f621cb1e1581dafe236ed5f57d334d6a106922f788cee74d7a62285043235e85180 SHA512 3538857063127913029e53ac786578306b0c9041bcfca71ab94a52982b58b1bdb95da5037a4ab6f7b311f6a8d4e7cff05187a894ec96041d9e9569fa78606ef4
 MISC metadata.xml 527 BLAKE2B b110a46a24ff9f9f8b93e28a17c40ff7d0674e9162e7804b476e9568fc4ddd1afd9c7386a129e9b2c3adf2010221e463cf0a32c720edda7fa31feb8ce806f5d0 SHA512 1f5cb81806c3155895a5a3a2b773c3ebbbfb35d7cafdb37b96961a46f6db11762a25444a868af975183b386bcc8dd8bf665e082a65d1c8423b224ea3185b31cd
diff --git a/media-sound/lilypond/lilypond-2.24.0.ebuild b/media-sound/lilypond/lilypond-2.24.0.ebuild
index b230712614fa..f703d97eea69 100644
--- a/media-sound/lilypond/lilypond-2.24.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.24.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~riscv x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 6ab9a35ffffb..7146f47b15e6 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,5 +2,5 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1412 BLAKE2B be585b9f45855ea9f52d202d80ae2b58ba9c90521c30adee36810d8c225fdb46d62e8107a898d2fef64eb4ec94b714c6c324b78a50ef688fd211d12be261ddd1 SHA512 fb147b05f5847d23be60dde328a99422e430c77f00fe41202424a7ddf8a0b96dc0818c44eb6345ce8453bdc8c8dafbb5815b1117950d6b4278da976c489b05ea
+EBUILD mac-4.11.4.5.7-r1.ebuild 1419 BLAKE2B f0f98dbf50f62289d4f6767b96c3a31d70561253c014c2f0dd4e0941941c3389ea5c59e404ded08c0e2e3d0d0c658dbb378993b18aca171e71ee17cd8c6a318f SHA512 96d6deb9c106b8efe2c7ec151aabafdf1922475274efaf37763a22e538bbb73b021b607c1fd95ad591dcce4ec5506b6ee6ce4bd9488d4e124a3ff6353a2a78ec
 MISC metadata.xml 374 BLAKE2B ac05d2add0cd7ac5956aad2f5a7bc031880ac86b1ba62266c3d5afcfa769e687d974cf00e1e1d4c3b50964b5a05c193f4a033eabe0ec0a6d626018aedf32be00 SHA512 586664bdcd30ef7b414740d264e143511f39411a33b845ce0f39503dd2215e501fba07c408ea777472ede967e91001617ac91dd9acb303ad8757bcabbba17b0e
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 477436996f12..37f6548f510d 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P/_/-}"
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 BDEPEND="cpu_flags_x86_mmx? ( dev-lang/yasm )"
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 326e9cd0c196..16d934f1ef84 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,5 @@
 AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f5cbe0999167f8eadd803df75ecaaaf3b4246d691be1b6106dbede0b3293747fa6d1cfc5f151968dd26065aa9e3b15 SHA512 3b5703614a3afe49cadaf74b2d5e9d436232af62dc60248f929961806ab058ed8b06df0fd9ec0f958e2b454e3be75028117fc9c7a071bef1f9d2aa5496c448c5
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
 DIST xmms2-0.9.2.tar.xz 1740744 BLAKE2B fc3b219c37c909e640a0f55f3280b3a4f1e3965ab6ac2da8814d569e9ff6b95a94b32dee04028e22555465fb02cd52857a6a2aebb4794d71bfa7836db642033e SHA512 07531b8d743e7454d9e2650dbdbaff1d75eb98f01ab9f8d3fa9ba031ef5ac066f69d1ce90c6a860014f1f0f5fd43c6a9a2a0330656d938c300a427e610b540a6
-EBUILD xmms2-0.9.2.ebuild 5291 BLAKE2B 941f9891cf0725e7a5dc19e26927285db7c58745684885056fd67a2f72a323f4247e780a60f22df7ca50c39753658842be0d61b0e9bd9b6645312a94967c6ac2 SHA512 063a7ccce94932b355f2b3f92b46cddb6066eb679ecbb593d96779c94f4c195846ad4524561d5898251a6a899f2356c8e7b2065fcec5a8b40a5de53b900e5810
+EBUILD xmms2-0.9.2.ebuild 5301 BLAKE2B ffd96216d8b0c98c76c7134219f242b340179ebb289b3bc56eeeee229cd8d8cced7ff8f273896bc6c7f0beca6c9885931533ff1e041b49a5332d7a2fd27fcc81 SHA512 1b65cc10f1b17576b6b6b81f2853037fbdd66a670bf17a6ace07ecc5560cc20b315751c56fdd94ca482f8de944e5c56c9b7d2572e9ecd2e501343d64c79c65a9
 MISC metadata.xml 1472 BLAKE2B 1ad415f39603eb6959f85bad95c95e49c6d36fbed3ea2fbe4e3c58772ed335cc5ec4375f19bfc60493a1c30911109f52e870df45acc36d972b0fc56e44c60803 SHA512 aaa7996662236229f4c78cfac1de6e702991c3191f8c20b25a290b6a0bde29a3a00355ad746a767206ea089e1be88ae79abd3a563ce3a8305480406af62f83e7
diff --git a/media-sound/xmms2/xmms2-0.9.2.ebuild b/media-sound/xmms2/xmms2-0.9.2.ebuild
index c575d578f54d..372064eac41a 100644
--- a/media-sound/xmms2/xmms2-0.9.2.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.x
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm ~loong ppc ~riscv x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
@@ -127,7 +127,7 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	perl? (	dev-perl/Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )"
+	python? ( $(python_gen_cond_dep '<dev-python/cython-3[${PYTHON_USEDEP}]') )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 919337ac6e00..15e0a3e237d9 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d26702c4bc1b..fdcb0597f7b8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,8 @@
 AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
 AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97 SHA512 dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
+DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58 SHA512 eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
 EBUILD mkvtoolnix-72.0.0.ebuild 2937 BLAKE2B ad306e107e1065ecbf0df631cb0eebb0d6f981da9f479b0a17604b016b21a6e0e544ee2f2eea50bb62cc3fcec7b8a59cfd717eee706d137f62e0717a5794584a SHA512 52e2adf07dce52e3bbf035bc11a9cfb27bc53e33109d3d781f845b1f0805b7999b4923ce9e89eb54f1b8b472819411019cd7bbb5776cdc36ccba123fc7ebfaf2
-EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
+EBUILD mkvtoolnix-75.0.0.ebuild 2931 BLAKE2B 2629f380406135f271c581fe50e42c45c736aed11abe9fc08382fd151c0f04e7f76603eb168931573574da73fd02b0f7e11398e6b3ce514aa80ea4fa4b83bba9 SHA512 d0cc16898f193a036f067845434a8be7964d688732e49beac384825c2d4ceb6fe84d12454130b19c1db91da11b0fc6cc9b23b4a846fc5e74264a44f90b845235
+EBUILD mkvtoolnix-9999.ebuild 2931 BLAKE2B 2629f380406135f271c581fe50e42c45c736aed11abe9fc08382fd151c0f04e7f76603eb168931573574da73fd02b0f7e11398e6b3ce514aa80ea4fa4b83bba9 SHA512 d0cc16898f193a036f067845434a8be7964d688732e49beac384825c2d4ceb6fe84d12454130b19c1db91da11b0fc6cc9b23b4a846fc5e74264a44f90b845235
 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0
diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
new file mode 100644
index 000000000000..628d982c71e9
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dbus debug dvd gui nls pch test"
+RESTRICT="!test? ( test )"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/gmp:=
+	>=dev-libs/libebml-1.4.4:=
+	>=dev-libs/libfmt-8.0.1:=
+	>=dev-libs/pugixml-1.11:=
+	media-libs/flac:=
+	>=media-libs/libmatroska-1.7.1:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	sys-libs/zlib
+	dvd? ( media-libs/libdvdread:= )
+	dev-qt/qtcore:5
+	gui? (
+		dev-qt/qtsvg:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+	)
+	app-text/cmark:0=
+	dbus? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/nlohmann_json-3.9.1
+	>=dev-libs/utfcpp-3.1.2
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-ruby/rake
+	virtual/pkgconfig
+	nls? (
+		sys-devel/gettext
+		app-text/po4a
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == *9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# bug #692018
+	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+	eautoreconf
+
+	# remove bundled libs
+	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
+}
+
+src_configure() {
+	# bug #692322, use system dev-libs/utfcpp
+	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex pch "" --disable-precompiled-headers)
+		$(use_enable dbus)
+
+		# Qt (of some version) is always needed, even for non-GUI builds,
+		# to do e.g. MIME detection. See e.g. bug #844097.
+		# But most of the Qt deps are conditional on a GUI build.
+		--disable-qt6
+		--enable-qt5
+		$(use_enable gui)
+		--with-qmake="$(qt5_get_bindir)"/qmake
+
+		$(use_with dvd dvdread)
+		$(use_with nls gettext)
+		$(usex nls "" --with-po4a=false)
+		--disable-update-check
+		--disable-optimization
+		--with-boost="${ESYSROOT}"/usr
+		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	dodoc NEWS.md
+	doman doc/man/*.1
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 23a2e80da85d..628d982c71e9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,7 +104,7 @@ src_configure() {
 
 		$(use_with dvd dvdread)
 		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
+		$(usex nls "" --with-po4a=false)
 		--disable-update-check
 		--disable-optimization
 		--with-boost="${ESYSROOT}"/usr
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 1c9cdd1a8b88..29e0c9ed5d90 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,6 +1,7 @@
 AUX 0.3.69/0001-context-improve-state-calculations.patch 2055 BLAKE2B d97130e6d1c00f29035bfbca6fa9bf3b943b593055dbcc0a12493adf25bbff7005102d7f10c3bd2c49b2e33e9fad81fb81c7ed86b72c39d3093680eeec3310fb SHA512 9fe6f193adf703cf0af24c00242d4be8e5f2ab21f79e3a6a82701dc3e5ec8de5125e4e2cf573949467300b21e022821b303a9e06d07d256013240ece5c251dad
 AUX 0.3.69/0002-revert-alsa-mixer-control-element.patch 2032 BLAKE2B c52203b8915c4bc62ccd7502e47e049a8f4ea786d3b20b1fce124a53da5db0636bd21145196a96a1cefde01efcfd4a9d04501d3a86661095a423b6a5861567d6 SHA512 5efdbc34471ea97539f7a3ade491938ad296c183282c66ffe8b184eafd6f38345d59f0948a912564af5b86978194f90cb252157f46cf7481c04298af9319f1f9
 AUX 0.3.69/0003-filter-chain-biquads.patch 731 BLAKE2B 933d7ee5bc19e41f4ad38dfcc2d1a870faa71f283b56a1d975be33b6a93c97fec439a3a94130a2f6c03ff9c6ec2d9d5ce667d2f060c9b883e0e8dbf16b1c86ec SHA512 6788b0b6d74617a970f7215c4a9592cd51eabd896fa5fed8e6f3f0a9e94d9d83081803ef55ea1d910ffe2c7f5425e09d0ac797b9663892a04991a2b753631c41
+AUX 0.3.70/parser-check-pointer.patch 731 BLAKE2B de916ae5e8f39759e7e2216cd47e96b254e924851836a594b5922739e4b11f0dd809969defba10fadc99306700497d06957084b4edd04f22c2e1a7d37e988509 SHA512 77225841a84cdec4163297a6094365b537775d6824b7ecf6dfca0b71785ec36358c24ed6e51aec6d6d68968dd6d5b7707745b76ef86d1a76e686320b76b4e3ca
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
@@ -8,7 +9,9 @@ AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dc
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
 DIST pipewire-0.3.67.tar.bz2 1531871 BLAKE2B 59ea184ae11ad2999f37f0ded785551894ce6fbf478146c53f1dc6cdfeae7aa50cf6151b1e5e9c63c4f288682e5da7fde523251096af7da9d79bf96dd9d94809 SHA512 538b8ee905760775a0522dd3883d5db9bcaafe93d80eb5b588e21e73de22637a49cd139d3ed4dcfd1a5822af85e4cede624eee899c1e51a115f1ba0a6966c7a5
 DIST pipewire-0.3.69.tar.bz2 1567927 BLAKE2B 1b62e7cd359a4b1ee75793939026eef2c09d87cf7f0537fe77c081cd1b029463681b8838c9e4c0b82686ba628d74316e38d6471dbfab21ebb4d159fd052f2d6d SHA512 95e91006928b9596b47a1becfcd975dfa6bcfb2286fc6007a5bed4f127d2fd2b7477573facdb73f3ebd5cb6b77b8e9ef714e5c0c2aec97ef9d3a768b477b6477
+DIST pipewire-0.3.70.tar.bz2 1573378 BLAKE2B 3824106cba9c1b0a82c6d8889b2b1473f4bfc5d0994ee9dd8b46a454c287bbd4e0ad5dc508df5d4a9b7c5f683898ed756947788e561f2bf51a3116b12e46d075 SHA512 8b25d90232d07d5b1e210bd8f24240438a7dcece23a5be59a4e49fc3daf51ebf659f2cc343a0d913310a4659792590ef981ab7a59890506557f9510d902a0cff
 EBUILD pipewire-0.3.67.ebuild 17491 BLAKE2B c4778fa3e2a3e72691ee280e06b94dc68730851b8baccc7a8a1db630dcf89ec06a5229e826c5e7b53a7b1369047ffeb2782aba5b47b7db6f4b0acbacd678070d SHA512 d49074253b32fbf4da193e99c2e5b684b9adbe85d4a68d666ee30adadf0fab925195b63544b929b85eeb049ed23010f88a05806cb87ad33f836185b8430943e0
 EBUILD pipewire-0.3.69-r1.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
+EBUILD pipewire-0.3.70.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
 EBUILD pipewire-9999.ebuild 17542 BLAKE2B 91ea87322e38984dd97391cd96e5a85a463651d9133f4c5ced0ce8498aef6f20c2c517aed9668ee138b2dbeef92af42a8487b30e556f481ae7380621b54a5422 SHA512 6c678aceec2805be7319d8f0000e7e0749cf17684c0f080ad572ec1477f97141aecd9977e76afcd6e0d3d0b2220cf71387acee5934b93f7e7f9610ae0a642e1d
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/0.3.70/parser-check-pointer.patch b/media-video/pipewire/files/0.3.70/parser-check-pointer.patch
new file mode 100644
index 000000000000..7409d83e7ebb
--- /dev/null
+++ b/media-video/pipewire/files/0.3.70/parser-check-pointer.patch
@@ -0,0 +1,21 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/83d2e85f490ea97e4ae94b95f20dd06566a14c31
+
+From 83d2e85f490ea97e4ae94b95f20dd06566a14c31 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Thu, 20 Apr 2023 12:32:07 +0200
+Subject: [PATCH] parser: add extra check to make coverity happy
+
+Fixes !1473
+--- a/spa/include/spa/pod/parser.h
++++ b/spa/include/spa/pod/parser.h
+@@ -455,7 +455,7 @@ static inline int spa_pod_parser_getv(struct spa_pod_parser *parser, va_list arg
+ 		const struct spa_pod *pod = NULL;
+ 		const char *format;
+ 
+-		if (ftype == SPA_TYPE_Object) {
++		if (f && ftype == SPA_TYPE_Object) {
+ 			uint32_t key = va_arg(args, uint32_t);
+ 			const struct spa_pod_object *object;
+ 
+-- 
+GitLab
diff --git a/media-video/pipewire/pipewire-0.3.70.ebuild b/media-video/pipewire/pipewire-0.3.70.ebuild
new file mode 100644
index 000000000000..a54b5c2d65dd
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.70.ebuild
@@ -0,0 +1,474 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 1. Please regularly check (even at the point of bumping) Fedora's packaging
+# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
+#
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# continue to move quickly. It's not uncommon for fixes to be made shortly
+# after releases.
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *_p* ]] ; then
+		MY_COMMIT=""
+		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
+		S="${WORKDIR}"/${PN}-${MY_COMMIT}
+	else
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="MIT LGPL-2.1+ GPL-2"
+# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
+SLOT="0/0.4"
+IUSE="bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2
+modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
+# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
+#   which provides adequate guarantee that alsa-lib will be able to provide audio services.
+#   If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
+#   When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
+# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity.
+REQUIRED_USE="
+	ffmpeg? ( extra )
+	bluetooth? ( dbus )
+	jack-sdk? ( !jack-client )
+	modemmanager? ( bluetooth )
+	system-service? ( systemd )
+	!sound-server? ( !pipewire-alsa )
+	jack-client? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/meson-0.59
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+	dbus? ( dev-util/gdbus-codegen )
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+# While udev could technically be optional, it's needed for a numebr of options,
+# and not really worth it, bug #877769.
+RDEPEND="
+	acct-group/audio
+	acct-group/pipewire
+	media-libs/alsa-lib
+	sys-libs/ncurses:=[unicode(+)]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		dev-libs/glib
+		media-libs/fdk-aac
+		media-libs/libldac
+		media-libs/libfreeaptx
+		media-libs/opus
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+		virtual/libusb:1
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flatpak? (
+		dev-libs/glib
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gsettings? (
+		>=dev-libs/glib-2.26.0:2
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	lv2? ( media-libs/lilv )
+	modemmanager? ( >=net-misc/modemmanager-1.10.0 )
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+	)
+	sound-server? (
+		!media-sound/pulseaudio[daemon(+)]
+		!media-sound/pulseaudio-daemon
+	)
+	readline? ( sys-libs/readline:= )
+	ssl? ( dev-libs/openssl:= )
+	systemd? ( sys-apps/systemd )
+	system-service? (
+		acct-user/pipewire
+	)
+	v4l? ( media-libs/libv4l )
+	X? (
+		media-libs/libcanberra
+		x11-libs/libX11
+		x11-libs/libXfixes
+	)
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+
+# TODO: Consider use cases where pipewire is not used for driving audio
+# Doing so with WirePlumber currently involves editing Lua scripts
+PDEPEND=">=media-video/wireplumber-0.4.8-r3"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+
+	# Used for upstream backports
+	[[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV}
+}
+
+multilib_src_configure() {
+	# https://bugs.gentoo.org/838301
+	filter-flags -fno-semantic-interposition
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+
+		$(meson_feature dbus)
+		$(meson_native_use_feature zeroconf avahi)
+		$(meson_native_use_feature doc docs)
+		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature gsettings)
+		$(meson_native_use_feature systemd)
+
+		$(meson_native_use_feature system-service systemd-system-service)
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
+
+		$(meson_native_use_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
+		-Dcompress-offload=disabled # TODO: tinycompress unpackaged
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379
+		$(meson_native_use_feature modemmanager bluez5-backend-native-mm)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature bluetooth bluez5-codec-aac)
+		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
+		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth opus)
+		$(meson_native_use_feature bluetooth bluez5-codec-opus)
+		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
+		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
+		# Not yet packaged.
+		# http://www.bluez.org/le-audio-support-in-pipewire/
+		-Dbluez5-codec-lc3=disabled
+		-Dbluez5-codec-lc3plus=disabled
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		$(meson_native_use_feature ffmpeg pw-cat-ffmpeg)
+		$(meson_native_use_feature flatpak)
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_use jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_use_feature lv2)
+		$(meson_native_use_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		$(meson_native_use_feature readline)
+		$(meson_native_use_feature ssl raop)
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_use_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		-Dlibmysofa=disabled # libmysofa is unpackaged
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
+
+		# We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only
+		# just became stable, with 5.15 being the previous LTS. Many people
+		# are still on it.
+		-Dpam-defaults-install=true
+
+		# Just for bell sounds in X11 right now.
+		$(meson_native_use_feature X x11)
+		$(meson_native_use_feature X x11-xfixes)
+		$(meson_native_use_feature X libcanberra)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --timeout-multiplier 10
+}
+
+multilib_src_install() {
+	# Our custom DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+
+		# Install pipewire conf loader hook
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/99-pipewire-default-hook.conf
+		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
+
+		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
+	fi
+
+	# Enable required wireplumber alsa and bluez monitors
+	if use sound-server; then
+		dodir /etc/wireplumber/main.lua.d
+		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
+
+		dodir /etc/wireplumber/bluetooth.lua.d
+		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
+	fi
+
+	if use system-service; then
+		newtmpfiles - pipewire.conf <<-EOF || die
+			d /run/pipewire 0755 pipewire pipewire - -
+		EOF
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
+
+		exeinto /usr/bin
+		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
+
+		# Disable pipewire-pulse if sound-server is disabled.
+		if ! use sound-server ; then
+			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
+		fi
+
+		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_preinst() {
+	HAD_SOUND_SERVER=0
+	HAD_SYSTEM_SERVICE=0
+
+	if has_version "media-video/pipewire[sound-server(-)]" ; then
+		HAD_SOUND_SERVER=1
+	fi
+
+	if has_version "media-video/pipewire[system-service(-)]" ; then
+		HAD_SYSTEM_SERVICE=1
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	use system-service && tmpfiles_process pipewire.conf
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -le 0.3.66-r1 ; then
+			elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions"
+			elog "and limits needed to function smoothly:"
+			elog
+			elog "1. Please make sure your user is in the 'pipewire' group for"
+			elog "the best experience with realtime scheduling (PAM limits behavior)!"
+			elog "You can add your account with:"
+			elog " usermod -aG pipewire <youruser>"
+			elog
+			elog "2. For the best experience with fast user switching, it is recommended"
+			elog "that you remove your user from the 'audio' group unless you rely on the"
+			elog "audio group for device access control or ACLs.:"
+			elog " usermod -rG audio <youruser>"
+			elog
+
+			if ! use jack-sdk ; then
+				elog
+				elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+				elog "alternative libraries have been installed to a non-default location."
+				elog "To use them, put pw-jack <application> before every JACK application."
+				elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+				elog "provider is still needed to compile the JACK applications themselves."
+				elog
+			fi
+
+			if use systemd ; then
+				ewarn
+				ewarn "PipeWire daemon startup has been moved to a launcher script!"
+				ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
+				ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
+				ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
+				ewarn
+				ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
+				ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
+				ewarn "advised that a D-Bus user session is set up before starting the script."
+				ewarn
+			fi
+
+			if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
+				elog
+				elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+				elog "are recommended to edit pulseaudio client configuration files:"
+				elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
+				elog "if it exists, and disable autospawning of the original daemon by setting:"
+				elog
+				elog "  autospawn = no"
+				elog
+				elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+				elog
+				elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+				elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
+				elog "command:"
+				elog
+				elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
+				elog
+			fi
+
+			if has_version 'net-misc/ofono' ; then
+				ewarn "Native backend has become default. Please disable oFono via:"
+				if systemd_is_booted ; then
+					ewarn "systemctl disable ofono"
+				else
+					ewarn "rc-update delete ofono"
+				fi
+			fi
+		fi
+	done
+
+	if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		# TODO: We could drop most of this if we set up systemd presets?
+		if use sound-server && use systemd ; then
+			elog
+			elog "When switching from PulseAudio, you may need to disable PulseAudio:"
+			elog
+			elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+			elog
+			elog "To use PipeWire, the user units must be manually enabled"
+			elog "by running this command as each user you use for desktop activities:"
+			elog
+			elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+			elog
+			elog "A reboot is recommended to avoid interferences from still running"
+			elog "PulseAudio daemon."
+			elog
+			elog "Both new users and those upgrading need to enable WirePlumber"
+			elog "for relevant users:"
+			elog
+			elog "  systemctl --user disable pipewire-media-session.service"
+			elog "  systemctl --user --force enable wireplumber.service"
+			elog
+			elog "Root user may replace --user with --global to change system default"
+			elog "configuration for all of the above commands."
+			elog
+		fi
+
+		if ! use sound-server ; then
+			ewarn
+			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
+			ewarn "your sound, please enable it. See the wiki at"
+			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
+			ewarn "for more details."
+			ewarn
+		fi
+	fi
+
+	if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then
+		ewarn
+		ewarn "You have enabled the system-service USE flag, which installs"
+		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
+		ewarn "service. This is more than likely NOT what you want. You are strongly"
+		ewarn "advised not to enable this mode and instead stick with systemd user"
+		ewarn "units. The default configuration files will likely not work out of the"
+		ewarn "box, and you are on your own with configuration."
+		ewarn
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information, and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
+
+	if use sound-server && ! use pipewire-alsa; then
+		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
+	fi
+}
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 599f20b08ed3..36288c1691e0 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -2,6 +2,6 @@ DIST vidcutter-6.0.5.1-libmpv-api2.patch 2327139 BLAKE2B c2665e2c501a19db86a2514
 DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9
 DIST vidcutter-6.0.5.1_p20230201.tar.gz 9858362 BLAKE2B da10506810f93f5635a364d35f293a2c587455ee5c29cf28c0636b7441e330e6ab70385c22d9da914a22c71fed9f6d13688bcac9106d4430e5820fdd2b377d28 SHA512 1b355db77f4e78ade6c0553441d9b60739209fde74db6d9f0be3613e31f99806c94f33bf40912a43106dfc77bde09a54768d5786e06116af3dae2f9851823041
 EBUILD vidcutter-6.0.5.1-r2.ebuild 1466 BLAKE2B 86eb6d245820c259f3195c19a610202bc0523902247a1b5ade7b55dea59996e7f926ea6e628d1bf28472938be1101f975c728c64008548259eac616bacb3d374 SHA512 9610892c8c2d651fb5484fb1896605ebccd80bda947a3294737a5fbe28cdccd7eff8b9b1fb40f44353841f330ff43b92c0676b7c9551a4c91e89227b44403226
-EBUILD vidcutter-6.0.5.1_p20230201.ebuild 1134 BLAKE2B 9033403600eb1685f9b99219d05e37fbb4e7a936934a019170386a13416534d17fb89845636ebb258bd8b8a8c0fad431c639d89bfdb9bc5d64afd3bd0eb58a47 SHA512 a5d9307329305881cc65bc132824f57c9d50d4f64d6f9008d9747310c8c80af210ab244b4586612d559f89ccdfb568667ab95fdf028d734704fde5e2e9d14774
+EBUILD vidcutter-6.0.5.1_p20230201.ebuild 1133 BLAKE2B e5dbda9af51c741ebb1ed55e7c33e998c14e83b1ef659422c24c888b179a5b453f5711029831bd7ad5cfb1847d4a7267af942da4a1ad30ec268d66bc3cee3a49 SHA512 f5135dd8e86322783faad10357a52f92f8e86084848a9b3bdcf69e3f565a0a2ff957b35c05f7858a21ba3819f668b25872bff4aee244b0483d4bb8366996206a
 EBUILD vidcutter-9999.ebuild 1039 BLAKE2B 23367dd798d30314be248a8fd8888614970ba2348f0b9398814d46482e4276e26f26484e6cb7ecbe7490af2548ac98a30b1b0e7a22d8ad72ce90289ca6edbdb8 SHA512 78047940d8eaca428fea020622142583e2e8c133aafce7bd69d44a154449cf077139d0a3d752d9228b35c1ee31a11b9a5cb58c6477f56b0fa894034fd2f86e9f
 MISC metadata.xml 461 BLAKE2B 0eeb6abbb7914b27cd567263de9001cfe17c9bd3b98a0887b21fd76b908a48c0abb3695039d21803709d47483078d15c5d412be7c408640ece0a433806272640 SHA512 55fd2db2f66d5cbc2410dfc57f235b90554cf3de4aaa88fc5069d499590ec45264499881f049c5469771f063638a65adad89686717c28abb89ef6ea632c88a30
diff --git a/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild
index bd4fdbba2f04..a0fbe3224e5c 100644
--- a/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild
+++ b/media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
 	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
 else
 	SRC_URI="https://github.com/ozmartian/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 403ca778e063..6a6035249d17 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f89790580ce7..beb32d4cd6b1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Apr 2023 11:39:51 +0000
+Thu, 20 Apr 2023 18:09:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 900d76357c90..183235be70a8 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-18T11:39:53Z
+TIMESTAMP 2023-04-20T18:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ+gYlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBf/FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCSUw//RxFq3nxCszEXCEUquJKZTq5XrNZKdXgURVLGRSu3nLEBg0QaaZPWWjDq
-Of0uF/zJChzmvvcpawNxNAosj6TY946nwj/Y3Kxe7NIrTmJZZgQ+ihaSKStAiwuu
-+z6csYpwoBf8nROyXjuOUYAXr7aQMKlT0L3Lde2nBBEZz6bm48VsxqhKa3K1hRqy
-+T9Ji2CTjqa0LCk1uWpmI45W6YVUevbOgbnqadRWmKLjGkMORvXCMKOB1iWO5WLO
-Ztiy3iLf4iYZI3PxbgH7BjW75txfGMAX6j0qmpIDWAVcAi5YbD3gI4iqxWce5N4y
-37wfbZONyGMCt1PMl3wDncmgaK2CXT7ylHUz6FpMgENWXOwVQIwgQsSx75NkypN7
-ohSw6oTOiQGMaOYzJz/iKxqHl9tx7j5rGG1Gl2HDgB7kX8eLSeb01XRSpROKoELJ
-syh4vOBvMc7t8sgCoxS+l3/kkOumW18CJuV0xXNrMOzSCOzUTxuhS5CkxQLRUrVO
-6jWYko/UQqEX8ZOfjBysWWOk76pzRFl+3+DBr8jxo5vcZDCnVkXPk4xxvoD6hxHE
-l1a0hRd1QCurrUB/9kZPgO7MClHyxaj+JhKZuCXU2mgvCoxprAaT4IK5737H2wWz
-G++Xw+bLA2fLKtqkRVttMcxOicdmG4IaSJjDJSoNQi4gNNoHdZk=
-=9REu
+klA/+Q/+MQVi2wQF4hbzJ/++/lL4htDFZyFusgmN4H2X5j+tgHj0FTdbECWW/PF8
+9S8IXCXF+i4okhWpfsLL/NJP8dUVE6STLdZfrppWI3sqpoSzdnXTcP7eZzb2L+ET
+9z9x17Fb3MdNBe+vbE64B5pcXgayeH8KBR8IUp2edw858nrwAH8dc0KdEH2+57oP
++wYGOHh2oaaxFUcNyrQcbxg7wczxeHqjm6K5zVsoJQWyum4KXyXRDudGVs7ssjxw
+SFb1wYD5Z8YfhHRVkttR/fhOzcpqYiC7Bdziium2wJlXv5X54tOuOcqKAu3a4+bn
+ucv45tqfg0uB3UM26ifLoTIOSsvYlQCNZzz2N6azCfxEcvXm54K0u+44TB1VFgO0
+/2PFFel0adx7sA+GLwIZiFKPDmw1ADp/x0q3tKtA9uZwKEtWtFQjXlNjZMY5rPdL
+CIANCeztCM8yzYW4q8rIFANGKnaE8mG1zEzkiGIGU7LxzmVid76LfAfld/UDWK1C
+1LLyYF5QOp/xTzuixWFQ2NABA+wHgYMMP0+wvBOA1nuXjdeVGKcngWErpx0g7mNV
+zKv+8WDt/pnMOFtDY7hJfJh5w/yYYfw0i1EAR9X7AVj2NOAy7UWOHzaiDNMZbzIM
+KZPos/MWN/vU6xGeSJpnhpi4z9qVwNAZBE7X2ZM7lovHyKR1QHE=
+=/XKS
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f89790580ce7..beb32d4cd6b1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Apr 2023 11:39:51 +0000
+Thu, 20 Apr 2023 18:09:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 16197aa14a81..b353a1d685c6 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 44c85bc7af27..0a4bb517aab5 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r2 b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r2
new file mode 100644
index 000000000000..9a0b8456db89
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=media-libs/alsa-lib sys-libs/ncurses:= nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt )
+DESCRIPTION=Speech tools for Festival Text to Speech engine
+EAPI=8
+HOMEPAGE=https://www.cstr.ed.ac.uk/projects/speech_tools/
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=nas openmp X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=FESTIVAL HPND BSD rc regexp-UofT
+RDEPEND=media-libs/alsa-lib sys-libs/ncurses:= nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt )
+SLOT=0
+SRC_URI=http://www.festvox.org/packed/festival/2.5/speech_tools-2.5.0-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e85fa42a675adc401531472ec3fa166a
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b01dafd2d405..6de36dbfdcc4 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.116 b/metadata/md5-cache/app-admin/awscli-1.27.116
new file mode 100644
index 000000000000..f34939a3dbd8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.116.tar.gz -> aws-cli-1.27.116.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2 b/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2
deleted file mode 100644
index 6023163e8931..000000000000
--- a/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sys-process/daemontools ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Make tinydns and dnscache logs human-readable
-EAPI=8
-HOMEPAGE=http://michael.orlitzky.com/code/djbdns-logparse.xhtml
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=AGPL-3+
-RDEPEND=sys-process/daemontools python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/djbdns-logparse-0.0.2.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dc2304f726c5a17f0177f6ad411e855e
diff --git a/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1 b/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1
index 0692f4922241..15d752434219 100644
--- a/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1
+++ b/metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=http://michael.orlitzky.com/code/djbdns-logparse.xhtml
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=AGPL-3+
 RDEPEND=sys-process/daemontools python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/djbdns-logparse-0.0.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2078d961eeaa1f8a7af7d5b607ba4934
+_md5_=71e7ae9303324b3072e6984e82132ec0
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2304.0 b/metadata/md5-cache/app-admin/rsyslog-8.2304.0
new file mode 100644
index 000000000000..e5dffb6e2fd3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2304.0
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/autoconf-archive-2015.02.24 sys-apps/lsb-release virtual/pkgconfig test? ( jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads(+)] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=8
+HOMEPAGE=https://www.rsyslog.com/
+INHERIT=autotools linux-info python-any-r1 systemd
+IUSE=clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp impcap jemalloc kafka kerberos kubernetes mdblookup mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl systemd test usertools +uuid xxhash zeromq
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) imhttp? ( dev-libs/apr-util www-servers/civetweb virtual/libcrypt:= ) impcap? ( net-libs/libpcap ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= dev-libs/libevent[threads(+)] ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:0= ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( dev-libs/openssl:0= ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-4:=[drafts] )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2304.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2304.0.tar.gz )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=374fe18711fb36b65fa63e9b2934a5bf
diff --git a/metadata/md5-cache/app-admin/su-exec-0.2 b/metadata/md5-cache/app-admin/su-exec-0.2
index 5979ba1619d8..0c8c1f72851c 100644
--- a/metadata/md5-cache/app-admin/su-exec-0.2
+++ b/metadata/md5-cache/app-admin/su-exec-0.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Switch user and group id and exec
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/ncopa/su-exec
 INHERIT=toolchain-funcs
 IUSE=static
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/ncopa/su-exec/archive/v0.2.tar.gz -> su-exec-0.2.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b5f6ce5cada34059157fbbb89ae561d3
+_md5_=152a48fc27efebe864c05279b583362f
diff --git a/metadata/md5-cache/app-admin/syslog-ng-4.1.1 b/metadata/md5-cache/app-admin/syslog-ng-4.1.1-r1
similarity index 70%
rename from metadata/md5-cache/app-admin/syslog-ng-4.1.1
rename to metadata/md5-cache/app-admin/syslog-ng-4.1.1-r1
index c936712f7515..ee852d2d59c4 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-4.1.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-4.1.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=sys-devel/bison-3.7.6 sys-devel/flex virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0= test? ( dev-libs/criterion )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=8
 HOMEPAGE=https://www.syslog-ng.com/products/open-source-log-management/
@@ -8,10 +8,10 @@ INHERIT=autotools python-single-r1 systemd
 IUSE=amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp:= ) snmp? ( net-analyzer/net-snmp:0= ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/openssl:0=
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) test? ( python )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-4.1.1/syslog-ng-4.1.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c365e276c55158caac0dcb0191b720bc
+_md5_=d6c65550663c373522e0b096ff50b776
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 10c14b03d025..09bb11fef303 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1-r1 b/metadata/md5-cache/app-arch/vimball-0.5.1-r1
index 91acc6dce2cb..4bbfe102490e 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1-r1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/radhermit/vimball/ https://pypi.org/project/vimball/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/vimball/vimball-0.5.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c5f2e7d955b70c39e130828de448c4d0
+_md5_=9fd79893085343ee31fe77248fd8427e
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 3eda6d5b6895..2ef968686912 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/burp-3.1.4 b/metadata/md5-cache/app-backup/burp-3.1.4
index 9d2ddb297067..6cb35407556e 100644
--- a/metadata/md5-cache/app-backup/burp-3.1.4
+++ b/metadata/md5-cache/app-backup/burp-3.1.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://burp.grke.org/
 INHERIT=autotools systemd
 IUSE=acl test xattr
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=AGPL-3
 RDEPEND=acct-group/burp acct-user/burp dev-libs/uthash dev-libs/openssl:0= net-libs/librsync:= sys-libs/ncurses:0= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr ) virtual/logger
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grke/burp/archive/3.1.4.tar.gz -> burp-3.1.4.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ebff3f0808745bc3fbdc8ca1d1154820
+_md5_=a45e03b972bf35859ae630b408ecfb50
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0 b/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
deleted file mode 100644
index b56a198cdc4a..000000000000
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Back up Untangle configurations via the web admin UI
-EAPI=7
-HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.xhtml
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.1.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4980d0c6a0ae1397cdb8f8a80a2ff841
diff --git a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1 b/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1
index ea11c25f07bb..6129c5269133 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://michael.orlitzky.com/code/untangle-https-backup.xhtml
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ssl(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.1.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e634744d4914f29663e8604c180d48d0
+_md5_=1dd4f0b36a9006e32925707c6afaeab9
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index a149bc9bc449..0d70a7693b48 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.15.06 b/metadata/md5-cache/app-benchmarks/stress-ng-0.15.07
similarity index 95%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.15.06
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.15.07
index c624dd7bcd38..d9c45055d633 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.15.06
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.15.07
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= apparmor? ( sys-apps/apparmor-utils sys-libs/libapparmor ) sctp? ( net-misc/lksctp-tools )
 SLOT=0
-SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.15.06.tar.gz -> stress-ng-0.15.06.tar.gz
+SRC_URI=https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V0.15.07.tar.gz -> stress-ng-0.15.07.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=ef4fa910ed944d6dff8e61d3ab5e4bc2
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 2be50d5ce99d..eeaaa6f376fe 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3 b/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
index 9cb9ec2c4f99..ed3593268f5e 100644
--- a/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
+++ b/metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/docker/compose
 INHERIT=bash-completion-r1 distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/distro-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docker-py-5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dockerpty-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docopt-0.6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dotenv-0.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-2.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/PySocks-1.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/texttable-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websocket-client-0.32.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.29.2.tar.gz -> docker-compose-1.29.2.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=179b16cf745eb533f7eb5f0da4a69a73
+_md5_=e34634c63285c3bbc13bb09ce4ee25cf
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index cb399cfa1829..eea3fe83a952 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/codegroup-20080907-r1 b/metadata/md5-cache/app-crypt/codegroup-20080907-r1
index 681beb624af6..5bdcb2d59672 100644
--- a/metadata/md5-cache/app-crypt/codegroup-20080907-r1
+++ b/metadata/md5-cache/app-crypt/codegroup-20080907-r1
@@ -1,12 +1,12 @@
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip
 DESCRIPTION=encode / decode binary file as five letter codegroups
-EAPI=6
-HOMEPAGE=http://www.fourmilab.ch/codegroup/
+EAPI=8
+HOMEPAGE=https://www.fourmilab.ch/codegroup/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.fourmilab.ch/codegroup/codegroup.zip -> codegroup-20080907.zip
+SRC_URI=https://www.fourmilab.ch/codegroup/codegroup.zip -> codegroup-20080907.zip
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3ee88048c2a35aea0e841a66ba7528e8
+_md5_=96ca71343f4f4474059d06f3f5714917
diff --git a/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1 b/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
index aaa1334e6a4d..db2631c6b245 100644
--- a/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
+++ b/metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=GIF colourmap steganography
-EAPI=6
-HOMEPAGE=http://www.darkside.com.au/gifshuffle/
+EAPI=8
+HOMEPAGE=https://darkside.com.au/gifshuffle/
 INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
-SRC_URI=http://www.darkside.com.au/gifshuffle/gifshuffle.tar.gz -> gifshuffle-2.0.tar.gz
+SRC_URI=https://darkside.com.au/gifshuffle/gifshuffle.tar.gz -> gifshuffle-2.0.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=01fbc080659bc721af3d2f58b251f9ef
+_md5_=b0d4e75ceeb963465460989a1df0d45b
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 8b5d1047944a..e15d3ac1f8db 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/kicad-doc-6.0.11 b/metadata/md5-cache/app-doc/kicad-doc-6.0.11
new file mode 100644
index 000000000000..ee3a62316daa
--- /dev/null
+++ b/metadata/md5-cache/app-doc/kicad-doc-6.0.11
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/asciidoc-8.6.9 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools manuals
+EAPI=8
+HOMEPAGE=https://docs.kicad.org/
+INHERIT=cmake
+IUSE=+html pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
+REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/6.0.11/kicad-doc-6.0.11.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b84bd63fbf421e833b96a937efbc94fe
diff --git a/metadata/md5-cache/app-doc/kicad-doc-7.0.1 b/metadata/md5-cache/app-doc/kicad-doc-7.0.1
new file mode 100644
index 000000000000..4e460c45c78c
--- /dev/null
+++ b/metadata/md5-cache/app-doc/kicad-doc-7.0.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-ruby/asciidoctor-2.0.12 >=app-text/dblatex-0.3.10 >=app-text/po4a-0.45 >=sys-devel/gettext-0.18 dev-perl/Unicode-LineBreak dev-util/source-highlight l10n_ca? ( dev-texlive/texlive-langspanish ) l10n_de? ( dev-texlive/texlive-langgerman ) l10n_en? ( dev-texlive/texlive-langenglish ) l10n_es? ( dev-texlive/texlive-langspanish ) l10n_fr? ( dev-texlive/texlive-langfrench ) l10n_it? ( dev-texlive/texlive-langitalian ) l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic ) l10n_pl? ( dev-texlive/texlive-langpolish ) l10n_ru? ( dev-texlive/texlive-langcyrillic ) l10n_zh? ( dev-texlive/texlive-langchinese ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools manuals
+EAPI=8
+HOMEPAGE=https://docs.kicad.org/
+INHERIT=cmake
+IUSE=+html pdf l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
+REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/7.0.1/kicad-doc-7.0.1.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=26fc2cc7b2ce073166e2456a5db073f6
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6ded9c94603a..ba2352434aba 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/joe-4.6-r2 b/metadata/md5-cache/app-editors/joe-4.6-r2
index 32dbfe4a5637..45e4a2aa6fa3 100644
--- a/metadata/md5-cache/app-editors/joe-4.6-r2
+++ b/metadata/md5-cache/app-editors/joe-4.6-r2
@@ -12,4 +12,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
 SLOT=0
 SRC_URI=mirror://sourceforge/joe-editor/joe-4.6.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ce5cadcc6c6e38b2b9c4a3bbc665df6a
+_md5_=c022081d1f476bd41203e0862231719f
diff --git a/metadata/md5-cache/app-editors/pyvim-3.0.3 b/metadata/md5-cache/app-editors/pyvim-3.0.3
index 744d890bf00f..42069db13aa2 100644
--- a/metadata/md5-cache/app-editors/pyvim-3.0.3
+++ b/metadata/md5-cache/app-editors/pyvim-3.0.3
@@ -6,7 +6,7 @@ HOMEPAGE=https://pypi.org/project/pyvim/ https://github.com/prompt-toolkit/pyvim
 IDEPEND=app-eselect/eselect-vi
 INHERIT=distutils-r1 edo
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-python/docopt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prompt-toolkit[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyflakes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prompt-toolkit/pyvim/archive/14118ad2e4d0da2e955fd9069b8772408307618b.tar.gz -> pyvim-3.0.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a957fec3af4baf5772bff746b9a49f47
+_md5_=a2fa38d7fef0005cd323b2ecba07a514
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0776ce11d758..6e6530c711f7 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0 b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
index 26a42eec9a35..b74a897b63d8 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
+++ b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Display icons for ivy buffers in Emacs
 EAPI=8
 HOMEPAGE=https://github.com/seagle0128/all-the-icons-ivy-rich/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/all-the-icons app-emacs/ivy-rich >=app-editors/emacs-25.3:*
 SLOT=0
 SRC_URI=https://github.com/seagle0128/all-the-icons-ivy-rich/archive/v1.9.0.tar.gz -> all-the-icons-ivy-rich-1.9.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=1abcecefea133ea7b444564f5eeb1d13
+_md5_=b684ac6e383c09e65b9cb8c54e9c42b0
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.26 b/metadata/md5-cache/app-emacs/buttercup-1.31
similarity index 76%
rename from metadata/md5-cache/app-emacs/buttercup-1.26
rename to metadata/md5-cache/app-emacs/buttercup-1.31
index e86994bbafab..1c108e9ac7ab 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.26
+++ b/metadata/md5-cache/app-emacs/buttercup-1.31
@@ -4,10 +4,10 @@ DESCRIPTION=Behaviour-driven Elisp testing
 EAPI=8
 HOMEPAGE=https://github.com/jorgenschaefer/emacs-buttercup
 INHERIT=elisp
-KEYWORDS=amd64 ppc sparc x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 SLOT=0
-SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.26.tar.gz -> buttercup-1.26.tar.gz
+SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.31.tar.gz -> buttercup-1.31.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=8eaccc6c1d963679ade46c8deaf2fee5
+_md5_=e3d40975b770949ddeb46687d0605f1d
diff --git a/metadata/md5-cache/app-emacs/citar-1.2.0 b/metadata/md5-cache/app-emacs/citar-1.2.0
index 824adffa6a4e..188cfefabd40 100644
--- a/metadata/md5-cache/app-emacs/citar-1.2.0
+++ b/metadata/md5-cache/app-emacs/citar-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs package to quickly find and act on bibliographic references
 EAPI=8
 HOMEPAGE=https://github.com/emacs-citar/citar/
 INHERIT=elisp
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+
 RDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-citar/citar/archive/v1.2.0.tar.gz -> citar-1.2.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=82fee0ea12c18b1763419245aa1e38e8
+_md5_=fca572a3418d6d685f8cb2dfccd15ead
diff --git a/metadata/md5-cache/app-emacs/doom-modeline-3.4.0 b/metadata/md5-cache/app-emacs/doom-modeline-3.4.0
new file mode 100644
index 000000000000..1ff996ba649f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/doom-modeline-3.4.0
@@ -0,0 +1,13 @@
+BDEPEND=app-emacs/all-the-icons app-emacs/compat app-emacs/shrink-path >=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Fancy and fast mode-line for Emacs inspired by minimalism design
+EAPI=8
+HOMEPAGE=https://seagle0128.github.io/doom-modeline/ https://github.com/seagle0128/doom-modeline/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-emacs/all-the-icons app-emacs/compat app-emacs/shrink-path >=app-editors/emacs-25.3:*
+SLOT=0
+SRC_URI=https://github.com/seagle0128/doom-modeline/archive/v3.4.0.tar.gz -> doom-modeline-3.4.0.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
+_md5_=9501fd19bbdb9a4adf38a4ea4e7fbcf3
diff --git a/metadata/md5-cache/app-emacs/marginalia-1.2 b/metadata/md5-cache/app-emacs/marginalia-1.2
new file mode 100644
index 000000000000..88c6e1e5fe3c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/marginalia-1.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-emacs/compat-29.1.4.0 >=app-editors/emacs-27.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Marginalia in the minibuffer
+EAPI=8
+HOMEPAGE=https://github.com/minad/marginalia
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/compat-29.1.4.0 >=app-editors/emacs-27.1:*
+SLOT=0
+SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/1.2.tar.gz -> marginalia-1.2.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
+_md5_=aa3466fb913b745cff18afc4f3f1c6e7
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.6.4 b/metadata/md5-cache/app-emacs/org-mode-9.6.4
new file mode 100644
index 000000000000..35ce4f511c5f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/org-mode-9.6.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( virtual/texi2dvi ) >=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=An Emacs mode for notes and project planning
+EAPI=8
+HOMEPAGE=https://www.orgmode.org/
+INHERIT=elisp readme.gentoo-r1
+IUSE=doc odt-schema
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
+RDEPEND=>=app-editors/emacs-25.3:*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.6.4.tar.gz
+_eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
+_md5_=567831454e98525b3087c46320283b5f
diff --git a/metadata/md5-cache/app-emacs/osm-0.9 b/metadata/md5-cache/app-emacs/osm-0.11
similarity index 57%
rename from metadata/md5-cache/app-emacs/osm-0.9
rename to metadata/md5-cache/app-emacs/osm-0.11
index f6a346c4c21c..71b79286c6b9 100644
--- a/metadata/md5-cache/app-emacs/osm-0.9
+++ b/metadata/md5-cache/app-emacs/osm-0.11
@@ -1,4 +1,4 @@
-BDEPEND=>=app-editors/emacs-27.1:*[jpeg,json,libxml2,png,svg] >=app-editors/emacs-27.1:*
+BDEPEND=>=app-editors/emacs-27.1:*[jpeg,json,libxml2,png,svg] >=app-emacs/compat-29.1.4.0 >=app-editors/emacs-27.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=OpenStreetMap tile-based viewer for GNU Emacs
 EAPI=8
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/minad/osm/
 INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=app-editors/emacs-27.1:*[jpeg,json,libxml2,png,svg] net-misc/curl[ssl] >=app-editors/emacs-27.1:*
+RDEPEND=>=app-editors/emacs-27.1:*[jpeg,json,libxml2,png,svg] >=app-emacs/compat-29.1.4.0 net-misc/curl[ssl] >=app-editors/emacs-27.1:*
 SLOT=0
-SRC_URI=https://github.com/minad/osm/archive/0.9.tar.gz -> osm-0.9.tar.gz
+SRC_URI=https://github.com/minad/osm/archive/0.11.tar.gz -> osm-0.11.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=ff65dd892126dc5eb4f05b1110ad03be
+_md5_=1534a8ffc3a3e95ca4d67f6ca3ce446b
diff --git a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1 b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
index 25dc59c5df06..14eb913fcfcc 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
+++ b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
@@ -2,7 +2,7 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.5.0.tar.gz -> projectile-2.5.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.5.0.tar.gz -> projectile-2.5.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
diff --git a/metadata/md5-cache/app-emacs/projectile-2.6.0 b/metadata/md5-cache/app-emacs/projectile-2.6.0
index 9a31d3c625d2..b3463ff5747a 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.6.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.6.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
 KEYWORDS=~amd64
@@ -10,6 +10,6 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.6.0.tar.gz -> projectile-2.6.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.6.0.tar.gz -> projectile-2.6.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=4ad66eae66bf2c07ddeb71c1ebe7dbc6
diff --git a/metadata/md5-cache/app-emacs/projectile-2.7.0 b/metadata/md5-cache/app-emacs/projectile-2.7.0
index d7883ce536ba..ffdde6a4e641 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.7.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.7.0
@@ -2,14 +2,14 @@ BDEPEND=test? ( app-emacs/buttercup ) >=app-editors/emacs-25.3:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=A project interaction library for Emacs
 EAPI=8
-HOMEPAGE=https://docs.projectile.mx
+HOMEPAGE=https://docs.projectile.mx https://github.com/bbatsov/projectile/
 INHERIT=elisp
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.3:*
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.7.0.tar.gz -> projectile-2.7.0.tar.gz
+SRC_URI=https://github.com/bbatsov/projectile/archive/v2.7.0.tar.gz -> projectile-2.7.0.tar.gz
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=64cb276ca252518c404fd9f49a78f40f
+_md5_=84abe2f63545cfae9aae6826cad84db7
diff --git a/metadata/md5-cache/app-emacs/shrink-path-0.3.1 b/metadata/md5-cache/app-emacs/shrink-path-0.3.1
index 1af99b4ef682..2f9c40332114 100644
--- a/metadata/md5-cache/app-emacs/shrink-path-0.3.1
+++ b/metadata/md5-cache/app-emacs/shrink-path-0.3.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/bennya/shrink-path.el/-/archive/v0.3.1/shrink-path.el-v0.3.1.tar.bz2
 _eclasses_=elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	dcd21c5d379fc2217e95f529504c5fe0
-_md5_=96c15b96c5b818318007718414870860
+_md5_=d27e2a080bd0ea97e1ad302197d2bee9
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 7662efa31a67..7cd98cae4fe7 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/cloud-hypervisor-31.0 b/metadata/md5-cache/app-emulation/cloud-hypervisor-31.0
new file mode 100644
index 000000000000..1fc1de701c11
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-hypervisor-31.0
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Open source Virtual Machine Monitor (VMM) that runs on top of KVM
+EAPI=8
+HOMEPAGE=https://www.cloudhypervisor.org
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://github.com/cloud-hypervisor/cloud-hypervisor/archive/refs/tags/v31.0.tar.gz -> cloud-hypervisor-31.0.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/cloud-hypervisor-31.0-vendor.tar.gz
+_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8d9e238572387ef019b184fc9baef6b0
diff --git a/metadata/md5-cache/app-emulation/cloud-hypervisor-9999 b/metadata/md5-cache/app-emulation/cloud-hypervisor-9999
new file mode 100644
index 000000000000..145c7fac548a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-hypervisor-9999
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Open source Virtual Machine Monitor (VMM) that runs on top of KVM
+EAPI=8
+HOMEPAGE=https://www.cloudhypervisor.org
+INHERIT=cargo git-r3
+IUSE=debug
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB
+PROPERTIES=live
+SLOT=0
+_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eb25e3d3d4ee8b566f90e2d746584856
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-22.1.1 b/metadata/md5-cache/app-emulation/crossover-bin-22.1.1
new file mode 100644
index 000000000000..bcc984b2c2bc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-22.1.1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-arch/cpio app-arch/unzip dev-lang/perl dev-util/bbe
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support
+EAPI=8
+HOMEPAGE=https://www.codeweavers.com/products/
+INHERIT=python-single-r1 unpacker
+IUSE=+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) !prefix? ( sys-libs/glibc ) capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)] jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/glib:2 dev-libs/gobject-introspection || ( dev-libs/openssl-compat:1.1.1 =dev-libs/openssl-1.1.1* ) dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] media-libs/tiff-compat:4[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/libunwind[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/vte:2.91[introspection] sys-libs/libxcrypt[compat]
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-22.1.1.bin
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=6638de3549788f0af3e753145d894aa6
diff --git a/metadata/md5-cache/app-emulation/dxvk-1.10.3 b/metadata/md5-cache/app-emulation/dxvk-1.10.3
index 5273160dfa81..5ac97708e5bd 100644
--- a/metadata/md5-cache/app-emulation/dxvk-1.10.3
+++ b/metadata/md5-cache/app-emulation/dxvk-1.10.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) dxgi? ( d3d11 ) || (
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v1.10.3.tar.gz -> dxvk-1.10.3.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=20539646fe57c076f188ae6a19a48332
+_md5_=33d01c67ab1b20cf2ee9e2ab8d7df061
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.0 b/metadata/md5-cache/app-emulation/dxvk-2.0
index 4e6a8834692e..9b35c3e9c44e 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.0
+++ b/metadata/md5-cache/app-emulation/dxvk-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) dxgi?
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.0.tar.gz -> dxvk-2.0.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a5ccc8ef5fe15af52c312a2a51f66407
+_md5_=023be448607437fef1d360117d2ae4f3
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.1 b/metadata/md5-cache/app-emulation/dxvk-2.1
index 1090c2b61f09..c603444ae164 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.1
+++ b/metadata/md5-cache/app-emulation/dxvk-2.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || (
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.1.tar.gz -> dxvk-2.1.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/d39344f466caae0495ebac4d49b03a886d83ba3a/dxvk-libdisplay-info-d39344f466.tar.bz2 https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a8b3c59424f01bb1674579ae18e84285
+_md5_=5b6d757fcd7f312e7007624a8ece02cd
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.1_p20230207 b/metadata/md5-cache/app-emulation/dxvk-2.1_p20230207
index 941e4dbae2d1..bbe1dadda1c0 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.1_p20230207
+++ b/metadata/md5-cache/app-emulation/dxvk-2.1_p20230207
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || (
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/caf31033d711460e86781b16a4d9b0f41fa9e817.tar.gz -> dxvk-caf31033d7.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/98f440ce6868c94f5ec6e198cc1adda4760e8849.tar.gz -> dxvk-vulkan-headers-98f440ce68.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/d39344f466caae0495ebac4d49b03a886d83ba3a/dxvk-libdisplay-info-d39344f466.tar.bz2 https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a0c9f0e13f346468aa9031b38d47db2b
+_md5_=9b8e9003754dca8b55b7753fd52642a4
diff --git a/metadata/md5-cache/app-emulation/wine-proton-8.0.1d b/metadata/md5-cache/app-emulation/wine-proton-8.0.1d
new file mode 100644
index 000000000000..dff6d3a0d912
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-proton-8.0.1d
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig nls? ( sys-devel/gettext ) !crossdev-mingw? ( dev-util/mingw64-toolchain[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers x11-base/xorg-proto
+DESCRIPTION=Valve Software's fork of Wine
+EAPI=8
+HOMEPAGE=https://github.com/ValveSoftware/wine/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools flag-o-matic multilib multilib-build python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+IUSE=+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( dev-libs/gmp:=[abi_x86_32(-)?,abi_x86_64(-)?] net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[opengl,abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.1 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.0.1d
+SRC_URI=https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-8.0-1d.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3721d0f0b0da384c6bcd821d3fe193cd
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-8.0.1 b/metadata/md5-cache/app-emulation/wine-vanilla-8.0.1
new file mode 100644
index 000000000000..515fb1f24975
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-8.0.1
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl sys-devel/binutils sys-devel/bison sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[abi_x86_32(-)?,abi_x86_64(-)?] ) ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) sys-kernel/linux-headers X? ( x11-base/xorg-proto )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=8
+HOMEPAGE=https://www.winehq.org/ https://gitlab.winehq.org/wine/wine/
+IDEPEND=>=app-eselect/eselect-wine-2
+INHERIT=autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+IUSE=+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama abi_x86_32 abi_x86_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?] opengl? ( media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?] osmesa? ( media-libs/mesa[osmesa,abi_x86_32(-)?,abi_x86_64(-)?] ) ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?] ) ) cups? ( net-print/cups[abi_x86_32(-)?,abi_x86_64(-)?] ) fontconfig? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?] ) netapi? ( net-fs/samba[abi_x86_32(-)?,abi_x86_64(-)?] ) odbc? ( dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?] ) sdl? ( media-libs/libsdl2[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?] ) truetype? ( media-libs/freetype[abi_x86_32(-)?,abi_x86_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?] ) capi? ( net-libs/libcapi:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?] media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?] ) pulseaudio? ( media-libs/libpulse[abi_x86_32(-)?,abi_x86_64(-)?] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)?,abi_x86_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?] ) unwind? ( llvm-libunwind? ( sys-libs/llvm-libunwind[abi_x86_32(-)?,abi_x86_64(-)?] ) !llvm-libunwind? ( sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?] ) ) usb? ( dev-libs/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?] ) app-emulation/wine-desktop-common dos? ( games-emulation/dosbox ) gecko? ( app-emulation/wine-gecko:2.47.3[abi_x86_32(-)?,abi_x86_64(-)?] ) gstreamer? ( media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?] ) mono? ( app-emulation/wine-mono:7.4.0 ) perl? ( dev-lang/perl dev-perl/XML-LibXML ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=X? ( truetype ) crossdev-mingw? ( mingw ) || ( abi_x86_32 abi_x86_64 )
+RESTRICT=test
+SLOT=8.0.1
+SRC_URI=https://dl.winehq.org/wine/source/8.0/wine-8.0.1.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=097518b5eec552f50ec35a5e2dd54806
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1 b/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
index 5505fa75ad42..384976bbb437 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
@@ -12,6 +12,6 @@ RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.16
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.3/xen-4.16.3.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
+SRC_URI=https://downloads.xenproject.org/release/xen/4.16.3/xen-4.16.3.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz -> edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a2fc61ec2da2f54b8e22db5db98ea12f
+_md5_=cea1f1389dfbcd1f03dc01c757ef032f
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1 b/metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1
index 5d05c2826d8d..00787dc73867 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1
@@ -12,6 +12,6 @@ RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.17
-SRC_URI=https://downloads.xenproject.org/release/xen/4.17.0/xen-4.17.0.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.17.1-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2
+SRC_URI=https://downloads.xenproject.org/release/xen/4.17.0/xen-4.17.0.tar.gz https://www.seabios.org/downloads/seabios-1.16.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz -> edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz -> brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.17.1-pre-patchset-0.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1b6fa2a94faebd73226a3f522cfa336e
+_md5_=f9365a055453b149b83247cc5913da2f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index f9074e69643c..24b805b79558 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
index e755c6063e01..e6619d37ee12 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-wxwidgets.git/
 INHERIT=multilib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.4.13
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114.tar.xz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=01cf6f48a1555c920966c7032f6c4899
+_md5_=3eab102e1ca3e8f4b4db6c78e41c0fb9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index cbb0d0608415..5081afc5bf62 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/g810-led-0.4.2 b/metadata/md5-cache/app-misc/g810-led-0.4.2
index 9d1456632895..641156dee530 100644
--- a/metadata/md5-cache/app-misc/g810-led-0.4.2
+++ b/metadata/md5-cache/app-misc/g810-led-0.4.2
@@ -12,4 +12,4 @@ RDEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 SLOT=0
 SRC_URI=https://github.com/MatMoul/g810-led/archive/v0.4.2.tar.gz -> g810-led-0.4.2.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=579682fa8c9209dbad5e39bc70a74333
+_md5_=ad1a5c2bedc5b531ce65235a63ac8fa7
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.2 b/metadata/md5-cache/app-misc/lirc-0.10.2
index 7fb08571423a..12bc9aed0d9d 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.2
+++ b/metadata/md5-cache/app-misc/lirc-0.10.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.lirc.org/
 INHERIT=linux-info python-single-r1 xdg-utils
 IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_9? ( dev-python/pyyaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyyaml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyyaml[python_targets_python3_11(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject[python_targets_python3_11(-)] ) ) inputlirc? ( app-misc/inputlircd )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.10.2.tar.bz2
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=44db843bfe05009e786816266c24fe54
+_md5_=f2d1d24c9ea94b2b2cae6f4e201ad6cf
diff --git a/metadata/md5-cache/app-misc/media-player-info-24 b/metadata/md5-cache/app-misc/media-player-info-24
deleted file mode 100644
index 1da86264e18d..000000000000
--- a/metadata/md5-cache/app-misc/media-player-info-24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=postinst postrm setup
-DEPEND=>=virtual/udev-208 || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) virtual/pkgconfig
-DESCRIPTION=Repository of data files describing media player capabilities
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/media-player-info/media-player-info
-INHERIT=python-any-r1 udev
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=virtual/udev-208
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-24.tar.gz
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=40926d04ca3269aa06f5093d9ec1628b
diff --git a/metadata/md5-cache/app-misc/media-player-info-24-r1 b/metadata/md5-cache/app-misc/media-player-info-24-r1
index 69e0db200516..685b393e2c7c 100644
--- a/metadata/md5-cache/app-misc/media-player-info-24-r1
+++ b/metadata/md5-cache/app-misc/media-player-info-24-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Repository of data files describing media player capabilities
 EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/media-player-info/media-player-info
 INHERIT=python-any-r1 udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=virtual/udev-208
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-24.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=8ec3f0a205005eec66c5eb7bf4312104
+_md5_=9b378cb29ec2eef2780527c24b5bb5f7
diff --git a/metadata/md5-cache/app-misc/openrgb-0.8-r1 b/metadata/md5-cache/app-misc/openrgb-0.8-r1
index 62fe206663c3..a871291dc14c 100644
--- a/metadata/md5-cache/app-misc/openrgb-0.8-r1
+++ b/metadata/md5-cache/app-misc/openrgb-0.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Open source RGB lighting control
 EAPI=8
 HOMEPAGE=https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/
 INHERIT=flag-o-matic qmake-utils udev xdg-utils
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~loong ~x86
 LICENSE=GPL-2
 RDEPEND=dev-cpp/cpp-httplib:= dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
 SLOT=0/2
 SRC_URI=https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.8/OpenRGB-release_0.8.tar.bz2
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d4b4ab07d6c8a00730fb104d75347c12
+_md5_=16c1b6095d3119eb7ab7cc1d7c4620d2
diff --git a/metadata/md5-cache/app-misc/openrgb-9999 b/metadata/md5-cache/app-misc/openrgb-9999
index a863b285ac6c..60c1ecb9f769 100644
--- a/metadata/md5-cache/app-misc/openrgb-9999
+++ b/metadata/md5-cache/app-misc/openrgb-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-cpp/cpp-httplib:= dev-libs/hidapi dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/mbedtls:= virtual/libusb:1
 SLOT=0/2
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=170fa1f18298f09f0af711e17e09a560
+_md5_=6529996c8f0e490227b6055f11b2f890
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-2.2.0 b/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
index c5ad2c4fbef1..8ed9e857235d 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
+++ b/metadata/md5-cache/app-misc/resolve-march-native-2.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hartwork/resolve-march-native
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-devel/gcc-4.2 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/2.2.0.tar.gz -> resolve-march-native-2.2.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1011b1eab6bb25d9bb29f1001e2c8e84
+_md5_=3a2f3be1d658d782af3bc3fc30306ef0
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 68328d1fc5d9..a3e6d874bdc3 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.11664-r3 b/metadata/md5-cache/app-office/wps-office-11.1.0.11664-r3
deleted file mode 100644
index aac47663adc1..000000000000
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.11664-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst unpack
-DESCRIPTION=WPS Office is an office productivity suite
-EAPI=8
-HOMEPAGE=https://www.wps.com/office/linux/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=unpacker xdg
-IUSE=systemd
-KEYWORDS=~amd64
-LICENSE=WPS-EULA
-RDEPEND=>=app-accessibility/at-spi2-core-2.46:2 app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/expat dev-libs/glib:2 dev-libs/libbsd || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 ) dev-libs/libgcrypt:0 dev-libs/libgpg-error dev-libs/libpcre:3 dev-libs/nspr dev-libs/nss media-libs/fontconfig:1.0 media-libs/freetype:2 || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/libpng:0 media-libs/libpulse || ( media-libs/tiff:0/0 media-libs/tiff-compat:4 ) net-libs/libasyncns net-print/cups sys-apps/attr sys-apps/util-linux sys-apps/dbus sys-apps/tcp-wrappers sys-libs/libcap sys-libs/zlib:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/libXv x11-libs/libxcb dev-libs/libxslt x11-libs/pango virtual/glu systemd? ( sys-apps/systemd )
-RESTRICT=bindist strip mirror
-SLOT=0
-SRC_URI=https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/11664/wps-office_11.1.0.11664_amd64.deb
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4318bf877d56c5e38af11db4bb179885
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 97876526f52b..83e37f854731 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.9-r3 b/metadata/md5-cache/app-portage/elogv-0.7.9-r3
index ca4f25a12a42..f33c72ab4982 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.9-r3
+++ b/metadata/md5-cache/app-portage/elogv-0.7.9-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/elogv.git/
 INHERIT=distutils-r1
 IUSE=l10n_de l10n_es l10n_it l10n_pl python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.9.tar.gz -> elogv-0.7.9.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8c25327ace1b640e56150f2f37cddd90
+_md5_=509eb4e5493fdf0518c4d7f8f4e1aff1
diff --git a/metadata/md5-cache/app-portage/flaggie-0.99.3 b/metadata/md5-cache/app-portage/flaggie-0.99.3
index e0a22be623b6..87909768c1d1 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.99.3
+++ b/metadata/md5-cache/app-portage/flaggie-0.99.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/projg2/flaggie/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=app-portage/gentoopm-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/projg2/flaggie/archive/v0.99.3.tar.gz -> flaggie-0.99.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4f48f088795dd48e273e2d3c658d251f
+_md5_=e7d5362d399bef8b6de38c56a0fed616
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.3-r2 b/metadata/md5-cache/app-portage/metagen-0.7.3-r2
index ed0198f78999..3fc1b61bbba9 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.3-r2
+++ b/metadata/md5-cache/app-portage/metagen-0.7.3-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/metagen/metagen-0.7.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6d4a14e4ab23cc13a72cda858c9db3d4
+_md5_=173b4b861d526deea536e639953a2df0
diff --git a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2 b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2
index 7b72491bdf88..be6bba71d342 100644
--- a/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2
+++ b/metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/slashbeast/pkg-testing-tools
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=sys-apps/portage[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/slashbeast/pkg-testing-tools/archive/refs/tags/v0.1.2.tar.gz -> pkg-testing-tools-0.1.2.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=37a6a3fc6a141a05308064b9a8c9d8c5
+_md5_=f393cbc48eee47f1691bbde685e06fad
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 89cc807fe528..0a1c2132aff9 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/crengine-ng-0.9.8 b/metadata/md5-cache/app-text/crengine-ng-0.9.8
new file mode 100644
index 000000000000..4031e8ac7ac7
--- /dev/null
+++ b/metadata/md5-cache/app-text/crengine-ng-0.9.8
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+DESCRIPTION=Cross-platform library designed to implement e-book readers
+EAPI=8
+HOMEPAGE=https://gitlab.com/coolreader-ng/crengine-ng
+INHERIT=cmake
+IUSE=+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/zlib png? ( media-libs/libpng:0 ) jpeg? ( media-libs/libjpeg-turbo ) >=media-libs/freetype-2.10.0 harfbuzz? ( media-libs/harfbuzz:= ) libunibreak? ( dev-libs/libunibreak:= ) fribidi? ( dev-libs/fribidi ) zstd? ( app-arch/zstd:= ) libutf8proc? ( dev-libs/libutf8proc:= ) fontconfig? ( media-libs/fontconfig )
+SLOT=0/5
+SRC_URI=https://gitlab.com/coolreader-ng/crengine-ng/-/archive/0.9.8/crengine-ng-0.9.8.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=255462c4ecaf1ec037e44cca2fd4e134
diff --git a/metadata/md5-cache/app-text/crqt-ng-1.0.11 b/metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
similarity index 66%
rename from metadata/md5-cache/app-text/crqt-ng-1.0.11
rename to metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
index 84b2765a4131..0bcda099302e 100644
--- a/metadata/md5-cache/app-text/crqt-ng-1.0.11
+++ b/metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DESCRIPTION=Cross-platform e-book reader
 EAPI=8
@@ -8,8 +8,8 @@ INHERIT=cmake plocale xdg
 IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+RDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crqt-ng/-/archive/1.0.11/crqt-ng-1.0.11.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4babf4a1be604e1b1a44df91687c8305
+_md5_=341f13ec43df96082c37586affe396be
diff --git a/metadata/md5-cache/app-text/crwx-ng-0.2.0-r2 b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
similarity index 64%
rename from metadata/md5-cache/app-text/crwx-ng-0.2.0-r2
rename to metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
index 1e42b7bfa9d1..cac33400580d 100644
--- a/metadata/md5-cache/app-text/crwx-ng-0.2.0-r2
+++ b/metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cross-platform e-book reader
 EAPI=8
@@ -6,9 +6,9 @@ HOMEPAGE=https://gitlab.com/coolreader-ng/crwx-ng
 INHERIT=cmake wxwidgets
 IUSE=+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] virtual/ttf-fonts
+LICENSE=GPL-2+
+RDEPEND=>=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] x11-libs/wxGTK:3.0-gtk3[X] virtual/ttf-fonts
 SLOT=0
 SRC_URI=https://gitlab.com/coolreader-ng/crwx-ng/-/archive/0.2.0/crwx-ng-0.2.0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c9b31838f444b18a139fca03564c50f3
+_md5_=68aecebd19d43aaee16bb2a0b9110644
diff --git a/metadata/md5-cache/app-text/gspell-1.12.0 b/metadata/md5-cache/app-text/gspell-1.12.0
index d0aaa5216f6b..2088c82779f8 100644
--- a/metadata/md5-cache/app-text/gspell-1.12.0
+++ b/metadata/md5-cache/app-text/gspell-1.12.0
@@ -7,7 +7,7 @@ HOMEPAGE=https://gitlab.gnome.org/GNOME/gspell
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2 vala virtualx
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gspell/1.12/gspell-1.12.0.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3dea1960e53ca94ec7cef9cc22e46a93
+_md5_=7bda511a9a080e79faad6f2e542e7f50
diff --git a/metadata/md5-cache/app-text/highlight-4.1 b/metadata/md5-cache/app-text/highlight-4.1
index 8e8de48173c5..f6dda7f8165d 100644
--- a/metadata/md5-cache/app-text/highlight-4.1
+++ b/metadata/md5-cache/app-text/highlight-4.1
@@ -1,10 +1,10 @@
 BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-libs/boost
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
 EAPI=7
 HOMEPAGE=http://www.andre-simon.de/
-INHERIT=lua-single qmake-utils toolchain-funcs
+INHERIT=lua-single qmake-utils toolchain-funcs xdg
 IUSE=examples qt5 lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
@@ -12,5 +12,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=http://www.andre-simon.de/zip/highlight-4.1.tar.bz2
-_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5518bc1bebd9fb7074cd7c3e2e721180
+_eclasses_=lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=89940da5fb505c4b612238ce9e6f6551
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.22 b/metadata/md5-cache/app-text/xapian-omega-1.4.22
index e404ad2e9938..89c698e7d612 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.22
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.22
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-libs/libpcre2:= ~dev-libs/xapian-1.4.22:0/30 sys-apps/f
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=8
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-libs/libpcre2:= ~dev-libs/xapian-1.4.22:0/30 sys-apps/file sys-libs/zlib
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-omega-1.4.22.tar.xz
-_md5_=5a8ec7b571f3217a9a434e92ed60bdf0
+_md5_=cc44e93307b37258e603329c514247c4
diff --git a/metadata/md5-cache/app-text/zotero-bin-6.0.22 b/metadata/md5-cache/app-text/zotero-bin-6.0.25
similarity index 81%
rename from metadata/md5-cache/app-text/zotero-bin-6.0.22
rename to metadata/md5-cache/app-text/zotero-bin-6.0.25
index 19464dcbca52..611c0d384e98 100644
--- a/metadata/md5-cache/app-text/zotero-bin-6.0.22
+++ b/metadata/md5-cache/app-text/zotero-bin-6.0.25
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=app-accessibility/at-spi2-core dev-libs/dbus-glib dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/fontconfig media-libs/freetype sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/pango
 SLOT=0
-SRC_URI=amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=6.0.22 -> zotero-bin-6.0.22-amd64.tar.bz2 ) x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=6.0.22 -> zotero-bin-6.0.22-x86.tar.bz2 )
+SRC_URI=amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=6.0.25 -> zotero-bin-6.0.25-amd64.tar.bz2 ) x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=6.0.25 -> zotero-bin-6.0.25-x86.tar.bz2 )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=78afa4a4d092654c725ca57c5d9e8de4
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index eb852d54d60e..28c79e24edb5 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2 b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
new file mode 100644
index 000000000000..262bf8e996f7
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( sys-libs/timezone-data ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
+EAPI=8
+HOMEPAGE=https://abseil.io
+INHERIT=cmake python-any-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0 test? ( BSD )
+RESTRICT=!test? ( test )
+SLOT=0/20230125
+SRC_URI=https://github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz -> abseil-cpp-20230125.2.tar.gz test? ( https://github.com/google/googletest/archive/v1.13.0.tar.gz -> gtest-1.13.0.tar.gz )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=88e99981e0f0fc94087c7d546e467f0b
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
index 30eb7a22ad37..dbf9cdb20a71 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
-SLOT=0/0.11
+SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.0.tar.gz -> cpp-httplib-0.12.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=096df3e9e11d942050d4fe095e2cf7d9
+_md5_=f82328ce55a00274e8409b86ff149898
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
index bebf7ccc0529..2494cfb358f9 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
@@ -11,7 +11,7 @@ LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=test? ( brotli ssl zlib )
 RESTRICT=!test? ( test )
-SLOT=0/0.11
+SLOT=0/0.12
 SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.1.tar.gz -> cpp-httplib-0.12.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=096df3e9e11d942050d4fe095e2cf7d9
+_md5_=f82328ce55a00274e8409b86ff149898
diff --git a/metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3 b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
similarity index 77%
rename from metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
rename to metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
index 4ec27cc1cdbd..f80c2ac35721 100644
--- a/metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
+++ b/metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
@@ -1,15 +1,17 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C++ HTTP/HTTPS server and client library
 EAPI=8
-HOMEPAGE=https://github.com/yhirose/cpp-httplib
-INHERIT=cmake-multilib python-any-r1
-IUSE=brotli ssl zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+HOMEPAGE=https://github.com/yhirose/cpp-httplib/
+INHERIT=cmake-multilib python-any-r1 toolchain-funcs
+IUSE=brotli ssl test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~loong ~x86
 LICENSE=MIT
 RDEPEND=brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/0.11
-SRC_URI=https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.11.3.tar.gz -> cpp-httplib-0.11.3.tar.gz
+REQUIRED_USE=test? ( brotli ssl zlib )
+RESTRICT=!test? ( test )
+SLOT=0/0.12
+SRC_URI=https://github.com/yhirose/cpp-httplib/archive/v0.12.2.tar.gz -> cpp-httplib-0.12.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3a9c61ec679cbb364c77efb4be2aed2b
+_md5_=b3c84d332775aa7e02caaf7812784327
diff --git a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0 b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
index f9ee95f20180..7e927f478580 100644
--- a/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
+++ b/metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-6.0.0/msgpack-cxx-6.0.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9539cf3924a261fa75c00878068c94db
+_md5_=d342b98ddc98c9d8506aa2d52f62eed4
diff --git a/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.3 b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.3
new file mode 100644
index 000000000000..57f3184d1ec8
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.3
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=dev-cpp/catch-3 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Rapid fuzzy string matching in C++
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/rapidfuzz-cpp/
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/rapidfuzz-cpp/archive/v1.11.3.tar.gz -> rapidfuzz-cpp-1.11.3.gh.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fbd510a472257b9527bdcda2bf7f77c7
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8d8d472c7aef..0390c39099a0 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1 b/metadata/md5-cache/dev-db/mongodb-4.4.20
similarity index 51%
rename from metadata/md5-cache/dev-db/mongodb-4.4.8-r1
rename to metadata/md5-cache/dev-db/mongodb-4.4.20
index 56c7bdc8e479..37e27c7ecd5e 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.20
@@ -1,17 +1,17 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.9.16-r1:3.9 test? ( dev-python/pymongo[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=dev-util/scons-3.1.1[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-3.3.1[python_targets_python3_9(-)] ) ) virtual/pkgconfig
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1-r1:3.11 test? ( dev-python/pymongo[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] ) >=dev-util/scons-3.1.1[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 test? ( dev-python/pymongo[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) >=dev-util/scons-3.1.1[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 test? ( dev-python/pymongo[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=dev-util/scons-3.1.1[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-3.3.1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-3.3.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-3.3.1[python_targets_python3_9(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= ) || ( >=dev-lang/python-3.9.16-r1:3.9 ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 INHERIT=check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
 IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=amd64 ~arm64 -riscv
+KEYWORDS=~amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.20.tar.gz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=828935422eb1e8622472e100fabca4fc
+_md5_=faa7aa61638558511393636f2a4ac305
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r2 b/metadata/md5-cache/dev-db/mongodb-5.0.16-r1
similarity index 52%
rename from metadata/md5-cache/dev-db/mongodb-4.4.8-r2
rename to metadata/md5-cache/dev-db/mongodb-5.0.16-r1
index 7fe0bea7bcc5..4e4d72060969 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r2
+++ b/metadata/md5-cache/dev-db/mongodb-5.0.16-r1
@@ -1,17 +1,17 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.9.16-r1:3.9 test? ( dev-python/pymongo[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=dev-util/scons-3.1.1[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-3.3.1[python_targets_python3_9(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= ) || ( >=dev-lang/python-3.9.16-r1:3.9 ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
+BDEPEND=|| ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-3.1.1[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-3.1.1[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-3.1.1[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-util/scons-3.3.1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-util/scons-3.3.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-util/scons-3.3.1[python_targets_python3_9(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= ) || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
 DESCRIPTION=A high-performance, open source, schema-free document-oriented database
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 INHERIT=check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-IUSE=debug kerberos lto ssl test +tools
-KEYWORDS=amd64 ~arm64 -riscv
+IUSE=debug kerberos lto mongosh ssl +tools cpu_flags_x86_avx
+KEYWORDS=~amd64 ~arm64 -riscv
 LICENSE=Apache-2.0 SSPL-1
-PDEPEND=tools? ( >=app-admin/mongo-tools-100 )
+PDEPEND=mongosh? ( app-admin/mongosh-bin ) tools? ( >=app-admin/mongo-tools-100 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:=[nls] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r5.0.16.tar.gz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a5a4f387642f9799677d8ae634905e7b
+_md5_=d10a2fa9c42e76476f972f5ed5898804
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
index ef9c00d13bc4..175d936d9cfc 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
@@ -5,10 +5,10 @@ DESCRIPTION=Hot backup utility for MySQL based servers
 EAPI=8
 HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
 INHERIT=cmake flag-o-matic
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.24/source/tarball/percona-xtrabackup-2.4.24.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=448378ea49504fde965e050775a7d0ea
+_md5_=550a28e33f080ba9be7889f0dc0d1d82
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
index 21b7af3e3c6a..bb0eebe6f81b 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
@@ -5,10 +5,10 @@ DESCRIPTION=Hot backup utility for MySQL based servers
 EAPI=8
 HOMEPAGE=https://www.percona.com/software/mysql-database/percona-xtrabackup
 INHERIT=cmake
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libfido2:= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.30-23/source/tarball/percona-xtrabackup-8.0.30-23.tar.gz https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=60b71e080d03038f70598de10c7258e1
+_md5_=db3f35dfbc282d0c6c6ba61461a39408
diff --git a/metadata/md5-cache/dev-db/sqlmap-1.7.3 b/metadata/md5-cache/dev-db/sqlmap-1.7.3
index 69a08a266ae0..2b861283e51c 100644
--- a/metadata/md5-cache/dev-db/sqlmap-1.7.3
+++ b/metadata/md5-cache/dev-db/sqlmap-1.7.3
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://sqlmap.org/
 INHERIT=bash-completion-r1 python-single-r1 wrapper
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/sqlmapproject/sqlmap/archive/refs/tags/1.7.3.tar.gz -> sqlmap-1.7.3.gh.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bb5c0373087a303f70bc7079cc631962
+_md5_=ebea929e1df06df14bf753cacf4cd73a
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index b639fd1e55b4..3d1a72446875 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
deleted file mode 100644
index b4763c74358a..000000000000
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) )
-DESCRIPTION=Userspace access to FTDI USB interface chips
-EAPI=7
-HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
-INHERIT=cmake python-single-r1
-IUSE=cxx doc examples python static-libs python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm ~arm64 ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=500cd35b5c55428ef5e9a65365e8e6ae
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r2 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r2
index f59e10f27880..36415fd8e35d 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r2
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
 INHERIT=cmake python-single-r1
 IUSE=cxx doc examples python static-libs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d94713b3dacd50ecd02016f3e82e7ca9
+_md5_=2eaeeec9bc24ec1d8aa1af2ad6ee3843
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.5-r4 b/metadata/md5-cache/dev-embedded/libftdi-1.5-r4
deleted file mode 100644
index 7e37c63ab750..000000000000
--- a/metadata/md5-cache/dev-embedded/libftdi-1.5-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) test? ( dev-libs/boost )
-DESCRIPTION=Userspace access to FTDI USB interface chips
-EAPI=7
-HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
-INHERIT=cmake python-single-r1
-IUSE=cxx doc examples python test tools python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=1
-SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7edebaca2dde4f3b6817cdd7bf2ee49a
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.5-r5 b/metadata/md5-cache/dev-embedded/libftdi-1.5-r5
index 5cb72f2a6c71..191fdb974663 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.5-r5
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.5-r5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
 INHERIT=cmake python-single-r1
 IUSE=cxx doc examples python test tools python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2
 RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) tools? ( dev-libs/confuse:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bb6f5adcd8eb69b3817ff60192b48f1a
+_md5_=6ab27e56b9392f8fe8003d25ffbf8349
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 2731b38d445a..0bd1c3491174 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2-r6 b/metadata/md5-cache/dev-java/commons-logging-1.2-r6
deleted file mode 100644
index 291ac7e5e59c..000000000000
--- a/metadata/md5-cache/dev-java/commons-logging-1.2-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An ultra-thin bridge between different Java logging libraries
-EAPI=8
-HOMEPAGE=https://commons.apache.org/logging/
-INHERIT=java-pkg-2 java-ant-2 java-osgi
-IUSE=avalon-framework avalon-logkit log4j servletapi test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=avalon-logkit? ( dev-java/avalon-logkit:2.0 ) avalon-framework? ( dev-java/avalon-framework:4.2 ) log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) servletapi? ( dev-java/jakarta-servlet-api:4 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-REQUIRED_USE=doc? ( avalon-framework avalon-logkit log4j servletapi )
-RESTRICT=!test? ( test ) !servletapi? ( test )
-SLOT=0
-SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-osgi	c82db640aeccac34f009e90c7bb10a81	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8e5b2fdebc8ca72e7d1ed312eb10aa52
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319 b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
index 4ab70a6a53a8..21330ffdd942 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
+++ b/metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://commons.apache.org/proper/commons-logging/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=log4j doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=log4j? ( dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/log4j-core:2 ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-logging/archive/d376d3128663e53de4af948e161291e7ec0c6ec1.tar.gz -> commons-logging-1.3.0_pre20230319.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=eafcf90c3b26571db693efe16c0e018d
+_md5_=fb1920203df026e8ee7d050ef3186bae
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12 b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
index 048cba60dcec..931b49d0f682 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/istack-commons/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-istack-commons/archive/3.0.12.tar.gz -> jaxb-istack-commons-3.0.12.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=8e37b97c94e7d76c618bb50d25da6c88
+_md5_=c717e7988f60081f22ed22d7b1b41a29
diff --git a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8 b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
index 42689fab08d7..3ce70ac56f6c 100644
--- a/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
+++ b/metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/fastinfoset:0 dev-java/istack-commons-runtime:3 dev-java/jaxb-api:2 dev-java/jaxb-stax-ex:1 ~dev-java/txw2-2.3.8:2 >=dev-java/jakarta-activation-1.2.2:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=214ca57f2a7406bc9ff56c953cf47b23
+_md5_=917e5380fd0ae39173add449e59d5a48
diff --git a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3 b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
index a7d93512595e..d0c69f038e66 100644
--- a/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
+++ b/metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://projects.eclipse.org/projects/ee4j/stax-ex
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-stax-ex/archive/1.8.3.tar.gz -> jaxb-stax-ex-1.8.3.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=e703680ef68fcf9f65dcd422c1a473f5
+_md5_=4ec6d8ad6365ba0acc1e5cdf72295a73
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.7 b/metadata/md5-cache/dev-java/maven-bin-3.8.7
deleted file mode 100644
index b424d51cb497..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=8
-HOMEPAGE=https://maven.apache.org/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=3.8
-SRC_URI=mirror://apache/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=ee8fd3e2203a061a7921f026d8c4ce99
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.8.8 b/metadata/md5-cache/dev-java/maven-bin-3.8.8
index 9b67940c7b4b..8c5722d04fa8 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.8.8
+++ b/metadata/md5-cache/dev-java/maven-bin-3.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=8
 HOMEPAGE=https://maven.apache.org/
 INHERIT=java-pkg-2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
 SLOT=3.8
 SRC_URI=mirror://apache/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=1e10e94ec50fd530070a526b6138b3d7
+_md5_=ee8fd3e2203a061a7921f026d8c4ce99
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.9.0 b/metadata/md5-cache/dev-java/maven-bin-3.9.0
deleted file mode 100644
index e6127b6399ad..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=8
-HOMEPAGE=https://maven.apache.org/
-INHERIT=java-pkg-2
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
-SLOT=3.9
-SRC_URI=mirror://apache/maven/maven-3/3.9.0/binaries/apache-maven-3.9.0-bin.tar.gz
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=e6f0453c51f05e4fd5e7b2db73053dba
diff --git a/metadata/md5-cache/dev-java/snakeyaml-2.0 b/metadata/md5-cache/dev-java/snakeyaml-2.0
index 5ae56b10299e..222397c728c1 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-2.0
+++ b/metadata/md5-cache/dev-java/snakeyaml-2.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/snakeyaml/snakeyaml
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://bitbucket.org/snakeyaml/snakeyaml/get/snakeyaml-2.0.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=34096284163b4e977e4bf07c47ce0e21
+_md5_=4b1fd7f8e828f702fadc05f5c3253b82
diff --git a/metadata/md5-cache/dev-java/txw2-2.3.8-r1 b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
index f8403107dc82..3cae62e85109 100644
--- a/metadata/md5-cache/dev-java/txw2-2.3.8-r1
+++ b/metadata/md5-cache/dev-java/txw2-2.3.8-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaxb-ri/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaxb-ri/archive/2.3.8-RI.tar.gz -> jaxb-ri-2.3.8.tar.gz
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	7dacd744ab3fb5ec581318fefaa7a9e5	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=0f919bb2e43a60538f609d2251d4e473
+_md5_=c9e7121a1c9d1fb27d06239df62d2bdc
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e7e659f4dae7..97ca94dc286b 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.20.0 b/metadata/md5-cache/dev-lang/jsonnet-0.20.0
new file mode 100644
index 000000000000..511ddf50c931
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.20.0
@@ -0,0 +1,17 @@
+BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) test? ( dev-cpp/gtest )
+DESCRIPTION=A data templating language for app and tool developers
+EAPI=8
+HOMEPAGE=https://jsonnet.org/
+INHERIT=cmake toolchain-funcs flag-o-matic distutils-r1
+IUSE=custom-optimization doc examples python test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/jsonnet/archive/v0.20.0.tar.gz -> jsonnet-0.20.0.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4aa4a883dd07d26c670ace8003df9706
diff --git a/metadata/md5-cache/dev-lang/vala-0.56.7 b/metadata/md5-cache/dev-lang/vala-0.56.7
new file mode 100644
index 000000000000..ae8fd69a181c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.56.7
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt sys-devel/flex virtual/pkgconfig app-alternatives/yacc >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.7 valadoc? ( >=media-gfx/graphviz-2.16 ) test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection )
+DESCRIPTION=Compiler for the GObject type system
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.7 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
+SLOT=0.56
+SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.7.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8e675e8ccb114c18ef7655024daf8d95
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b3af646d5fa6..309594ce3bc7 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/confuse-3.3-r2 b/metadata/md5-cache/dev-libs/confuse-3.3-r2
index 08ac04a84c7c..12381baf6f35 100644
--- a/metadata/md5-cache/dev-libs/confuse-3.3-r2
+++ b/metadata/md5-cache/dev-libs/confuse-3.3-r2
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/martinh/libconfuse
 INHERIT=multilib-minimal flag-o-matic
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/martinh/libconfuse/releases/download/v3.3/confuse-3.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cba2b09517e7bf12532e37a5c629bc38
+_md5_=944ba8cffdf68890e2cb44af91cb801a
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18
index 965bbe89b2f6..cd3c9aa60218 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=media-libs/gmmlib-22.1.7:=
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/23.05.25593.18.tar.gz -> intel-compute-runtime-23.05.25593.18.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c3a55b4e6cad2d1e0fddfbb4b13dff82
+_md5_=802e425d25b1d0e5dd2b2a83b4f8c649
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.11 b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.13.26032.8
similarity index 53%
rename from metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.11
rename to metadata/md5-cache/dev-libs/intel-compute-runtime-23.13.26032.8
index 014933d96ad6..1b301e37f4cc 100644
--- a/metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.11
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-23.13.26032.8
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/intel-metrics-library-0_pre20220930:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.12812.26 >=dev-util/intel-graphics-system-controller-0.8.7:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.9.4:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
+DEPEND=dev-libs/intel-metrics-discovery:= dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.12822.1 >=dev-util/intel-graphics-system-controller-0.8.7:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.10.0:= ) vaapi? ( x11-libs/libdrm[video_cards_intel] media-libs/libva )
 DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
 EAPI=8
 HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake flag-o-matic
 IUSE=+l0 +vaapi
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=media-libs/gmmlib-22.1.7:=
+RDEPEND=>=media-libs/gmmlib-22.3.5:=
 SLOT=0
-SRC_URI=https://github.com/intel/compute-runtime/archive/23.05.25593.11.tar.gz -> intel-compute-runtime-23.05.25593.11.tar.gz
+SRC_URI=https://github.com/intel/compute-runtime/archive/23.13.26032.8.tar.gz -> intel-compute-runtime-23.13.26032.8.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=18d10b2a8128d799cf1363731b5866ed
+_md5_=61cbed9c666686483c2bab627bfe2333
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164 b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
index 08e2ed97d08d..aaf892b67808 100644
--- a/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
+++ b/metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=x11-libs/libdrm
 DESCRIPTION=A user mode library that provides access to GPU performance data
 EAPI=8
-HOMEPAGE=https://github.com/intel/metrics-library
+HOMEPAGE=https://github.com/intel/compute-runtime
 INHERIT=cmake
 KEYWORDS=~amd64
 LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/libdrm
 SLOT=0/1.12.164
 SRC_URI=https://github.com/intel/metrics-discovery/archive/refs/tags/metrics-discovery-1.12.164.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b8f9f7dca3ffb6c6f358d30b7bb1d153
+_md5_=fe4a231f376a2af9e0948f22131ea2de
diff --git a/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417 b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417
new file mode 100644
index 000000000000..60ff1f1eb5d7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libdrm
+DESCRIPTION=User mode driver helper library that provides access to GPU performance counters
+EAPI=8
+HOMEPAGE=https://github.com/intel/metrics-library
+INHERIT=cmake
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libdrm
+SLOT=0/133
+SRC_URI=https://github.com/intel/metrics-library/archive/5524ef74cf0423006992a52571590cb8bc2d7468.tar.gz -> intel-metrics-library-0_pre20230417.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2269c408ad1177f1a0a749c92103c5d9
diff --git a/metadata/md5-cache/dev-libs/ktextaddons-1.1.1-r1 b/metadata/md5-cache/dev-libs/ktextaddons-1.2.0
similarity index 97%
rename from metadata/md5-cache/dev-libs/ktextaddons-1.1.1-r1
rename to metadata/md5-cache/dev-libs/ktextaddons-1.2.0
index b62410e8063a..fa36272a34c6 100644
--- a/metadata/md5-cache/dev-libs/ktextaddons-1.1.1-r1
+++ b/metadata/md5-cache/dev-libs/ktextaddons-1.2.0
@@ -12,6 +12,6 @@ LICENSE=LGPL-2+
 RDEPEND=dev-libs/qtkeychain:=[qt5(+)] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=kde-frameworks/kconfig-5.103.0:5 >=kde-frameworks/kconfigwidgets-5.103.0:5 >=kde-frameworks/kcoreaddons-5.103.0:5 >=kde-frameworks/ki18n-5.103.0:5 >=kde-frameworks/kwidgetsaddons-5.103.0:5 >=kde-frameworks/kxmlgui-5.103.0:5 speech? ( >=dev-qt/qtspeech-5.15.5:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/ktextaddons/ktextaddons-1.1.1.tar.xz
+SRC_URI=mirror://kde/stable/ktextaddons/ktextaddons-1.2.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9cca7f1d685a94190aefc65e7d28832a
diff --git a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1 b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
index a3a1e4aca443..63c32914ff97 100644
--- a/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 INHERIT=autotools libtool multilib-minimal
 IUSE=cddb +cxx minimal static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7:0= cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=mirror://gnu/libcdio/libcdio-2.1.0.tar.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1453d70e78a9f6af71117a5a2eda7a50
+_md5_=6f8a55651c9917b8462bd42d3d173823
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
index 5ae8e62a8eba..dab2b5d82620 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libcdio/
 INHERIT=autotools multilib-minimal
 IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.1.tar.bz2
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ef47924e38e96797caae8a2941000436
+_md5_=d7b65aa1cd0a36fb6dc241d726400e87
diff --git a/metadata/md5-cache/sci-libs/libcifpp-5.0.5 b/metadata/md5-cache/dev-libs/libchdr-0_p20230230
similarity index 54%
rename from metadata/md5-cache/sci-libs/libcifpp-5.0.5
rename to metadata/md5-cache/dev-libs/libchdr-0_p20230230
index 84e50cd6cd7e..c13a70854c92 100644
--- a/metadata/md5-cache/sci-libs/libcifpp-5.0.5
+++ b/metadata/md5-cache/dev-libs/libchdr-0_p20230230
@@ -1,16 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=
-DESCRIPTION=Code to work with mmCIF and PDB files
+DEPEND=sys-libs/zlib:=
+DESCRIPTION=Standalone library for reading MAME's CHDv1-v5 formats
 EAPI=8
-HOMEPAGE=https://github.com/PDB-REDO/libcifpp
+HOMEPAGE=https://github.com/rtissera/libchdr/
 INHERIT=cmake
-IUSE=test
 KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/boost:=
-RESTRICT=!test? ( test )
+LICENSE=BSD
+RDEPEND=sys-libs/zlib:=
 SLOT=0
-SRC_URI=https://github.com/PDB-REDO/libcifpp/archive/refs/tags/v5.0.5.tar.gz -> libcifpp-5.0.5.tar.gz https://dev.gentoo.org/~pacho/libcifpp/libcifpp-5.0.5-components.cif.gz
+SRC_URI=https://github.com/rtissera/libchdr/archive/fec8ab94212cc65d9d9a62cb3da924f5830c04b0.tar.gz -> libchdr-0_p20230230.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=89972910bb7c2deaaa27aaf75c3875cc
+_md5_=a6cd67617c8d8a2e721c2309435bb59c
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index ed9302ea5118..183093393fcc 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1146abd4294efeffbee6b66090a04a69
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index e89266861b4e..bc34bf2bea89 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1d1c104375d7a3406edd39028898ffef
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.1 b/metadata/md5-cache/dev-libs/libclc-16.0.1
index 87dd87e09e8d..34484de669f1 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.1
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.1
@@ -10,5 +10,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=75e107841b2809e5c6a7f568c1861581
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.2 b/metadata/md5-cache/dev-libs/libclc-16.0.2
new file mode 100644
index 000000000000..933954086885
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=75e107841b2809e5c6a7f568c1861581
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.2.9999 b/metadata/md5-cache/dev-libs/libclc-16.0.3.9999
similarity index 90%
rename from metadata/md5-cache/dev-libs/libclc-16.0.2.9999
rename to metadata/md5-cache/dev-libs/libclc-16.0.3.9999
index f3f555158998..5cb9fe5fa8a9 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.2.9999
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.3.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a58fe7488220b532b0ac71a5315cdb8b
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999 b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
index 586727f3ecbc..20813d30846c 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0.9999
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325
index f1d76437987f..4be0f1c2d36b 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414
index aa6f1e0946dd..bf6c8d2c9388 100644
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414
+++ b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0fae6b12ce0d1ece79a21405ece2b4f9
diff --git a/metadata/md5-cache/dev-libs/libdispatch-5.8 b/metadata/md5-cache/dev-libs/libdispatch-5.8
new file mode 100644
index 000000000000..724cbe42f11a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdispatch-5.8
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/clang sys-devel/llvm virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
+DESCRIPTION=A library for concurrent code execution on multicore hardware
+EAPI=8
+HOMEPAGE=https://github.com/apple/swift-corelibs-libdispatch
+INHERIT=flag-o-matic cmake toolchain-funcs
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=!gnustep-base/libobjc2 !sys-libs/blocksruntime
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.8-RELEASE.tar.gz -> libdispatch-5.8.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=31fd530942c9b257ba855cf1e816f3d5
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.4 b/metadata/md5-cache/dev-libs/libtpms-0.9.4
deleted file mode 100644
index 3961743e9cdf..000000000000
--- a/metadata/md5-cache/dev-libs/libtpms-0.9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=Library providing software emultion of a TPM
-EAPI=8
-HOMEPAGE=https://github.com/stefanberger/libtpms
-INHERIT=autotools
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.4.tar.gz -> libtpms-0.9.4.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=25d8bce12395fa7a94ce806e486fcca0
diff --git a/metadata/md5-cache/dev-libs/libtpms-0.9.5 b/metadata/md5-cache/dev-libs/libtpms-0.9.5
deleted file mode 100644
index 1ae09134ea0e..000000000000
--- a/metadata/md5-cache/dev-libs/libtpms-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=Library providing software emultion of a TPM
-EAPI=8
-HOMEPAGE=https://github.com/stefanberger/libtpms
-INHERIT=autotools
-KEYWORDS=amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://github.com/stefanberger/libtpms/archive/v0.9.5.tar.gz -> libtpms-0.9.5.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=340819beda6b5a2b2a3801e29ce02ca7
diff --git a/metadata/md5-cache/dev-libs/mdns-1.4.2 b/metadata/md5-cache/dev-libs/mdns-1.4.2
index fbca5845a2ca..bc0c9c70b07c 100644
--- a/metadata/md5-cache/dev-libs/mdns-1.4.2
+++ b/metadata/md5-cache/dev-libs/mdns-1.4.2
@@ -4,9 +4,9 @@ DESCRIPTION=Public domain mDNS/DNS-SD library in C
 EAPI=8
 HOMEPAGE=https://github.com/mjansson/mdns
 INHERIT=cmake
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~loong ~x86
 LICENSE=Unlicense
 SLOT=0
 SRC_URI=https://github.com/mjansson/mdns/archive/refs/tags/1.4.2.tar.gz -> mdns-1.4.2.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3eb29f4e41d8a4714ebb3d1400cf347d
+_md5_=2cbfb194dcb56a05073c8dbea7a8b227
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1s b/metadata/md5-cache/dev-libs/openssl-1.1.1s
deleted file mode 100644
index 0fbbeab18194..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1s
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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 ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=33438fa2ec620fffcb98fa5051c6d16c
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r2 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r2
deleted file mode 100644
index 2dcdd3aa4fe8..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc kernel_linux? ( sys-process/procps ) ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Full-strength general purpose cryptography library (including SSL and TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
-IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt
-LICENSE=openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
-RESTRICT=!test? ( test )
-SLOT=0/1.1
-SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=b6874d8b59096fde03573c05004decf1
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
index 037e20b34faf..c50e4fed68eb 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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 ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=20b8315994f499f67928fdd5882b58af
+_md5_=6ecda2b56d44917799d40de1a3d2482e
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8-r1 b/metadata/md5-cache/dev-libs/openssl-3.0.8-r1
deleted file mode 100644
index 38ce9938f828..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.0.8-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=2d1bff7d3179464c05deb484d734805a
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8-r3 b/metadata/md5-cache/dev-libs/openssl-3.0.8-r3
deleted file mode 100644
index 2d75a52dc648..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.0.8-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=97356695405bf7aafdd2416f8f4182de
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8-r2 b/metadata/md5-cache/dev-libs/openssl-3.0.8-r4
similarity index 98%
rename from metadata/md5-cache/dev-libs/openssl-3.0.8-r2
rename to metadata/md5-cache/dev-libs/openssl-3.0.8-r4
index cf2b2d2ad08c..af2a9fa541ec 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.8-r2
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.8-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=086c16b8975cb40fdf34227e43c62503
+_md5_=a315330e3a1d4bd5b826e4a428c46362
diff --git a/metadata/md5-cache/dev-libs/openssl-3.1.0 b/metadata/md5-cache/dev-libs/openssl-3.1.0
deleted file mode 100644
index 86182f069616..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.1.0.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.1.0.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=2c0d719ca7524faba52f57980146490b
diff --git a/metadata/md5-cache/dev-libs/openssl-3.1.0-r2 b/metadata/md5-cache/dev-libs/openssl-3.1.0-r2
deleted file mode 100644
index 08c6ef09c576..000000000000
--- a/metadata/md5-cache/dev-libs/openssl-3.1.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps ) verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)
-EAPI=8
-HOMEPAGE=https://www.openssl.org/
-INHERIT=edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
-IUSE=+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-LICENSE=Apache-2.0
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=mirror://openssl/source/openssl-3.1.0.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.1.0.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=504259faeef4fc6c915b3b52cb3f44e7
diff --git a/metadata/md5-cache/dev-libs/openssl-3.1.0-r1 b/metadata/md5-cache/dev-libs/openssl-3.1.0-r3
similarity index 98%
rename from metadata/md5-cache/dev-libs/openssl-3.1.0-r1
rename to metadata/md5-cache/dev-libs/openssl-3.1.0-r3
index 74998803e891..dca1758ad2ed 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.1.0-r1
+++ b/metadata/md5-cache/dev-libs/openssl-3.1.0-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.1.0.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.1.0.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=430ff5c4d9114eb13ae8e26ef6027c98
+_md5_=b652dfde8bd3c2957f00d146ab80b128
diff --git a/metadata/md5-cache/dev-libs/sdformat-9.8.0 b/metadata/md5-cache/dev-libs/sdformat-9.10.0
similarity index 92%
rename from metadata/md5-cache/dev-libs/sdformat-9.8.0
rename to metadata/md5-cache/dev-libs/sdformat-9.10.0
index c47ea6be93a8..3cf1bd290ac4 100644
--- a/metadata/md5-cache/dev-libs/sdformat-9.8.0
+++ b/metadata/md5-cache/dev-libs/sdformat-9.10.0
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/urdfdom-1:= dev-libs/tinyxml dev-libs/boost:= sci-libs/ignition-math:6=
 SLOT=0/9
-SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.8.0.tar.bz2
+SRC_URI=http://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.10.0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=282408ac6e0b9a4d6da3e8caef2273ea
+_md5_=649b6af7278662e4fa0bc5025fafa236
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.56.7 b/metadata/md5-cache/dev-libs/vala-common-0.56.7
new file mode 100644
index 000000000000..690f1832fb80
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.56.7
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala
+INHERIT=gnome.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.7.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe
+_md5_=f953170eb099f68c0730b59bdda6ec1e
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.22 b/metadata/md5-cache/dev-libs/xapian-1.4.22
index 7da3d6fcff42..033d50a01460 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.22
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.22
@@ -4,9 +4,9 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=8
 HOMEPAGE=https://xapian.org/
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux sys-libs/zlib
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-core-1.4.22.tar.xz
-_md5_=d49ef4bdbca635984aa1e8b88e2ded17
+_md5_=2e307aa5c11b92350d3d8b0d1fa41ef3
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
index 15de4e3574a2..af7450c472f8 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://xapian.org/
 INHERIT=autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.21 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) mono? ( dev-lang/mono ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) ) ruby? ( ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ) tcl? ( dev-lang/tcl:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) ruby? ( || ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 ) ) php? ( || ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.22/xapian-bindings-1.4.22.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	mono-env	cef880fd27385e7e80934656e8789627	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	php-ext-source-r3	3a4893beb5327f4519ae3278ef151fa7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8e09163d18d3015c98f20939c649f7de
+_md5_=95b5c2bdf037b5af6930c34b9df16427
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.06 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.06
new file mode 100644
index 000000000000..e5372bc9dcd3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.06
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/openssl:= sys-libs/ncurses:= sys-libs/readline:= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
+DESCRIPTION=A lightweight RPC library based on XML and HTTP
+EAPI=8
+HOMEPAGE=http://xmlrpc-c.sourceforge.net/
+INHERIT=toolchain-funcs
+IUSE=abyss +cgi +curl +cxx +libxml2 threads test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-libs/openssl:= sys-libs/ncurses:= sys-libs/readline:= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
+REQUIRED_USE=test? ( abyss curl cxx )
+RESTRICT=!test? ( test )
+SLOT=0/4.54
+SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.06.tgz
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5624bc18f2763add4a7b72cfb2cfaba3
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index e5b2f13d651c..d984b243123f 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.3.0-r2 b/metadata/md5-cache/dev-lua/lualdap-1.3.0-r2
deleted file mode 100644
index ac915120c374..000000000000
--- a/metadata/md5-cache/dev-lua/lualdap-1.3.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( net-nds/openldap:= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) )
-DEFINED_PHASES=compile install prepare test
-DEPEND=net-nds/openldap:= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-DESCRIPTION=A lua binding for the OpenLDAP client libraries
-EAPI=8
-HOMEPAGE=https://github.com/lualdap/lualdap
-INHERIT=lua toolchain-funcs
-IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86
-LICENSE=MIT
-RDEPEND=net-nds/openldap:= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
-REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/lualdap/lualdap/archive/v1.3.0.tar.gz -> lualdap-1.3.0.tar.gz
-_eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3bd4fa97de1b852f7468562e82d98391
diff --git a/metadata/md5-cache/dev-lua/lualdap-1.3.1 b/metadata/md5-cache/dev-lua/lualdap-1.3.1
index 70db66c0186b..148992ef37e2 100644
--- a/metadata/md5-cache/dev-lua/lualdap-1.3.1
+++ b/metadata/md5-cache/dev-lua/lualdap-1.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lualdap/lualdap
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc x86
 LICENSE=MIT
 RDEPEND=net-nds/openldap:= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lualdap/lualdap/archive/v1.3.1.tar.gz -> lualdap-1.3.1.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb254d2f2cc96256b859e1447fec087e
+_md5_=086625c939e9644400b036c979fb50ca
diff --git a/metadata/md5-cache/dev-lua/luasec-1.3.1 b/metadata/md5-cache/dev-lua/luasec-1.3.1
index 78d12e111c41..e48dbade5534 100644
--- a/metadata/md5-cache/dev-lua/luasec-1.3.1
+++ b/metadata/md5-cache/dev-lua/luasec-1.3.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/brunoos/luasec
 INHERIT=lua toolchain-funcs
 IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-lua/luasocket-3.0_rc1_p20200328-r103[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-3(-)?,lua_targets_lua5-4(-)?] dev-libs/openssl:0= lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v1.3.1.tar.gz -> luasec-1.3.1.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7ff58a1d4989497bccd35baebafefcde
+_md5_=af7eaacacf14f6f8e8ef312203c6b30f
diff --git a/metadata/md5-cache/dev-lua/mpack-1.0.10 b/metadata/md5-cache/dev-lua/mpack-1.0.10
index da94a91c8a48..e78cb8aa5eab 100644
--- a/metadata/md5-cache/dev-lua/mpack-1.0.10
+++ b/metadata/md5-cache/dev-lua/mpack-1.0.10
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libmpack/libmpack-lua/
 INHERIT=lua toolchain-funcs
 IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-libs/libmpack lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libmpack/libmpack-lua/archive/1.0.10.tar.gz -> mpack-1.0.10.tar.gz
 _eclasses_=lua	8f9406bfff123a92ad04e4ace3e7f89b	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9bb87be2d7fb72d7c1b4d6e686516dc7
+_md5_=d1756e4a5d2737fc6a6483bb969bb522
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index d7ea7f4e9a91..613bab2ae308 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/async_kernel-0.15.0 b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
index f968ba4f2e3f..6a2693798b92 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/async_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.15.0.tar.gz -> async_kernel-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f11930e838146cae22dbec960c85305b
+_md5_=1387db4271ba83b968090466071878d9
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1 b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
index dc94fcd3f00d..e7e44f91a5fd 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/base_bigstring
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.15.0.tar.gz -> base_bigstring-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a0fa581fb05a91fafa1cfba1772aff51
+_md5_=097b72be9b65e8156a4e2ba110afb382
diff --git a/metadata/md5-cache/dev-ml/charinfo_width-1.1.0 b/metadata/md5-cache/dev-ml/charinfo_width-1.1.0-r1
similarity index 63%
rename from metadata/md5-cache/dev-ml/charinfo_width-1.1.0
rename to metadata/md5-cache/dev-ml/charinfo_width-1.1.0-r1
index 75f6b4e5053c..6e8b756e5851 100644
--- a/metadata/md5-cache/dev-ml/charinfo_width-1.1.0
+++ b/metadata/md5-cache/dev-ml/charinfo_width-1.1.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/camomile:= dev-ml/ppx_expect:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=<dev-ml/camomile-2.0.0:= dev-ml/ppx_expect:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Determine column width for a character
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/kandu/charInfo_width
 INHERIT=dune
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-ml/camomile:= dev-ml/ppx_expect:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=<dev-ml/camomile-2.0.0:= dev-ml/ppx_expect:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz -> charinfo_width-1.1.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=251d1de1025f2b506f3f1acc755ea8f5
+_md5_=7d52f96e118e0e6f268dc7ff463dfd28
diff --git a/metadata/md5-cache/dev-ml/core-0.15.1-r1 b/metadata/md5-cache/dev-ml/core-0.15.1-r1
index 0cdcd35a23c9..aa43f6786e92 100644
--- a/metadata/md5-cache/dev-ml/core-0.15.1-r1
+++ b/metadata/md5-cache/dev-ml/core-0.15.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.11 >=dev-ml/base-0.15.1:0/0.15 dev-ml/base_bigstring:0/0.15 dev-ml/base_quickcheck:= dev-ml/bin_prot:= dev-ml/ppxlib:= dev-ml/ppx_bin_prot:= dev-ml/ppx_bench:= dev-ml/ppx_custom_printf:= dev-ml/ppx_disable_unused_warnings:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_let:= dev-ml/ppx_log:= dev-ml/ppx_jane:0/0.15 dev-ml/ppx_module_timer:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_ignore_instrumentation:= dev-ml/typerep:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core/archive/v0.15.1.tar.gz -> core-0.15.1.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a6e153bcdfdaa51fc6b23609d96d0749
+_md5_=8835113d625b1b517a785df74ad38e86
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.15.0 b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
index 05ba06446f58..b0f41cf5c7cd 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.15.0
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.15.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/core_kernel
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/core:0/0.15 dev-ml/int_repr:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.15.0.tar.gz -> core_kernel-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ccbba6b48f77126cc020a751f6716f22
+_md5_=b909f9dea2c33095559e67922ab72ca1
diff --git a/metadata/md5-cache/dev-ml/int_repr-0.15.0 b/metadata/md5-cache/dev-ml/int_repr-0.15.0
index ebf38f975816..3870ee8167a1 100644
--- a/metadata/md5-cache/dev-ml/int_repr-0.15.0
+++ b/metadata/md5-cache/dev-ml/int_repr-0.15.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/janestreet/int_repr
 INHERIT=dune
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-ml/ppx_jane:0/0.15 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.15
 SRC_URI=https://github.com/janestreet/int_repr/archive/refs/tags/v0.15.0.tar.gz -> int_repr-0.15.0.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=4094069403017abfd9e3799c4abf4a78
+_md5_=2a7fc5834a1e284709fa514be0c52aab
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index e2383ebc557d..b11a2ac4d16d 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=81a9f3aae36c4d277e7deb51da8e2119
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index f4f9dbfa7e71..2b08cdadd22f 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=47ac9fc5ccf47d31fdeabf577e9b531c
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1
index 1f5cb04d4d2d..e6c69230e1cf 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=bb054ccbb72b406130928bc4c24b2faa
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2
new file mode 100644
index 000000000000..9081c4d75523
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.2:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2[llvm_targets_Xtensa] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.2
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bb054ccbb72b406130928bc4c24b2faa
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2.9999
deleted file mode 100644
index 1dddab43eb95..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2.9999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.2.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PROPERTIES=live
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.2.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/16.0.2.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3.9999
new file mode 100644
index 000000000000..8ac8f819ee8f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3.9999
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.3.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PROPERTIES=live
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-16.0.3.9999:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Xtensa] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test )
+SLOT=0/16.0.3.9999
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
index 88c3736cc8c6..b4de1f3cf488 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325
index 3baa262e41ee..d121b40474d1 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414
index 4a027f0a1a29..5c74b2aa498e 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0e3e6f841757b36483d0138e342540e9
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2-r1
similarity index 57%
rename from metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
rename to metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2-r1
index 4d75399fdf7d..5106291de379 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext test? ( dev-ml/ounit2[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:= >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext test? ( dev-ml/ounit2[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Provides support for internationalization of OCaml program
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
+RDEPEND=dev-ml/base:= >=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=] sys-devel/gettext >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f1f8387eb742183684028c7212f30900
+_md5_=df0e689acea0005877e8703cabbed407
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2-r1
similarity index 62%
rename from metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
rename to metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2-r1
index 7ceb5a472a5e..2b39bb229831 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= test? ( dev-ml/ounit2[ocamlopt=] dev-ml/ocaml-fileutils ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:= <dev-ml/camomile-2.0.0:=[ocamlopt] dev-ml/ocaml-gettext:= test? ( dev-ml/ounit2[ocamlopt=] dev-ml/ocaml-fileutils ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Support for internationalization of OCaml programs using the Camomile library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
+RDEPEND=dev-ml/base:= <dev-ml/camomile-2.0.0:=[ocamlopt] dev-ml/ocaml-gettext:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=3af0f52df492ca789b7c2dfc707c42e5
+_md5_=f493f7003503555293b42e2c9d35d7b1
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r2
similarity index 51%
rename from metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
rename to metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r2
index 7e768f6778c5..6d904c643939 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r2
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator dev-lang/ocaml dev-ml/dune
+BDEPEND=>=dev-ml/cppo-1.6.6 dev-ml/dune-configurator test? ( dev-ml/ocaml-fileutils dev-ml/ounit2[ocamlopt=] ) dev-lang/ocaml dev-ml/dune
 DEFINED_PHASES=compile install prepare test
-DEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 test? ( dev-ml/ocaml-fileutils dev-ml/ounit2[ocamlopt=] ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/base:= dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Support for internationalization of OCaml programs using native gettext library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 INHERIT=dune
 IUSE=+ocamlopt test
 KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
-RESTRICT=!test? ( test )
+RDEPEND=dev-ml/base:= dev-ml/ocaml-gettext:= !<dev-ml/ocaml-gettext-0.4.2 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=test
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
 _eclasses_=dune	beddc7cde467b2e48afc78a87d042c01	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a98414dc5e553900718d5e76104f96fb
+_md5_=7712cb3c676851614a69f11275ae72a8
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100 b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
index 4e9d42cac77b..a9b96531daad 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
+++ b/metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://metacpan.org/release/ExtUtils-Depends
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Data-Dumper virtual/perl-File-Spec virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8001.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b9d24ebdc7ea3e162fbf12dcbe1a584e
+_md5_=e99702b208ce0b4df4926d7c63478f30
diff --git a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0 b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
index 809689fb5bb8..9285bdcbe891 100644
--- a/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
+++ b/metadata/md5-cache/dev-perl/Log-Agent-1.5.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Log-Agent
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Artistic-2
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MR/MROGASKI/Log-Agent-1.005.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=dfc7eab80a2f99d1ffc765199f5be640
+_md5_=358766a9a98fb93c4458c13253684269
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index b978624162ed..e5ec5678799e 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.329.300 b/metadata/md5-cache/dev-perl/glib-perl-1.329.300
index 5aa55389f7df..b61695c59600 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.329.300
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.329.300
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3293.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=cd63497282784b3e4963057fc53e3c1e
+_md5_=ed648cc4ca396162ed41216f6b1a5366
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 7ab805b2ee88..5a567e46fd24 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/twig-1.44.7 b/metadata/md5-cache/dev-php/twig-1.44.7
new file mode 100644
index 000000000000..186ef29a454e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/twig-1.44.7
@@ -0,0 +1,13 @@
+BDEPEND=test? ( dev-php/phpunit dev-lang/php:*[ctype] dev-php/fedora-autoloader )
+DEFINED_PHASES=install postinst test
+DESCRIPTION=PHP templating engine with syntax similar to Django
+EAPI=8
+HOMEPAGE=https://twig.symfony.com/
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[ctype] dev-php/fedora-autoloader
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/twigphp/Twig/archive/v1.44.7.tar.gz -> twig-1.44.7.tar.gz
+_md5_=5f4fb5a174a90f187c9740542baa886f
diff --git a/metadata/md5-cache/dev-python/Levenshtein-0.21.0 b/metadata/md5-cache/dev-python/Levenshtein-0.21.0
new file mode 100644
index 000000000000..3d854fc8d1c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Levenshtein-0.21.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( <dev-python/rapidfuzz-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/rapidfuzz-cpp-1.7.0
+DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
+EAPI=8
+HOMEPAGE=https://pypi.org/project/Levenshtein/ https://github.com/maxbachmann/Levenshtein/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=<dev-python/rapidfuzz-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxbachmann/Levenshtein/archive/v0.21.0.tar.gz -> Levenshtein-0.21.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6e75087b58eba3be3ee4e767a28da5e1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9fbfc546130d..2560b45eebc8 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQt6-6.4.2 b/metadata/md5-cache/dev-python/PyQt6-6.4.2
index 55d5e1e8b6a7..23f9a4690e00 100644
--- a/metadata/md5-cache/dev-python/PyQt6-6.4.2
+++ b/metadata/md5-cache/dev-python/PyQt6-6.4.2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-python/PyQt-builder-1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.4:6 sys-devel/gcc dbus? ( virtual/pkgconfig ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.5-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-qt/qtbase-6.4:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.4:6[designer] ) help? ( >=dev-qt/qttools-6.4:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.4:6 ) positioning? ( >=dev-qt/qtpositioning-6.4:6 ) qml? ( >=dev-qt/qtdeclarative-6.4:6 ) quick3d? ( >=dev-qt/qtquick3d-6.4:6 ) serialport? ( >=dev-qt/qtserialport-6.4:6 ) svg? ( >=dev-qt/qtsvg-6.4:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.4:6 ) websockets? ( >=dev-qt/qtwebsockets-6.4:6 )
+DEPEND=>=dev-qt/qtbase-6.4:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.4:6[designer] ) help? ( >=dev-qt/qttools-6.4:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.4:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.4:6 ) qml? ( >=dev-qt/qtdeclarative-6.4:6 ) quick3d? ( >=dev-qt/qtquick3d-6.4:6 ) serialport? ( >=dev-qt/qtserialport-6.4:6 ) svg? ( >=dev-qt/qtsvg-6.4:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.4:6 ) websockets? ( >=dev-qt/qtwebsockets-6.4:6 )
 DESCRIPTION=Python bindings for the Qt framework
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning +printsupport quick quick3d serialport +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtbase-6.4:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.4:6[designer] ) help? ( >=dev-qt/qttools-6.4:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.4:6 ) positioning? ( >=dev-qt/qtpositioning-6.4:6 ) qml? ( >=dev-qt/qtdeclarative-6.4:6 ) quick3d? ( >=dev-qt/qtquick3d-6.4:6 ) serialport? ( >=dev-qt/qtserialport-6.4:6 ) svg? ( >=dev-qt/qtsvg-6.4:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.4:6 ) websockets? ( >=dev-qt/qtwebsockets-6.4:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-qt/qtbase-6.4:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.4:6[designer] ) help? ( >=dev-qt/qttools-6.4:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.4:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.4:6 ) qml? ( >=dev-qt/qtdeclarative-6.4:6 ) quick3d? ( >=dev-qt/qtquick3d-6.4:6 ) serialport? ( >=dev-qt/qtserialport-6.4:6 ) svg? ( >=dev-qt/qtsvg-6.4:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.4:6 ) websockets? ( >=dev-qt/qtwebsockets-6.4:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( gui widgets ) qml? ( network ) quick3d? ( gui qml ) quick? ( gui qml ) sql? ( widgets ) svg? ( gui ) testlib? ( gui widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.4.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7a2c83f4a9298e20785708d30e7de230
+_md5_=d9e26733df19ae73b2a72f20dc3d3c9b
diff --git a/metadata/md5-cache/dev-python/PyQt6-6.5.0 b/metadata/md5-cache/dev-python/PyQt6-6.5.0
index 3a068c93407a..d92c0d15178d 100644
--- a/metadata/md5-cache/dev-python/PyQt6-6.5.0
+++ b/metadata/md5-cache/dev-python/PyQt6-6.5.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-python/PyQt-builder-1.15[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtbase-6.5:6 sys-devel/gcc dbus? ( virtual/pkgconfig ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.7.5-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-qt/qtbase-6.5:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 )
+DEPEND=>=dev-qt/qtbase-6.5:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 )
 DESCRIPTION=Python bindings for the Qt framework
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
 IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning +printsupport quick quick3d serialport spatialaudio +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtbase-6.5:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-qt/qtbase-6.5:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.5:6[designer] ) help? ( >=dev-qt/qttools-6.5:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.5:6 ) opengl? ( gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-6.5:6 ) qml? ( >=dev-qt/qtdeclarative-6.5:6 ) quick3d? ( >=dev-qt/qtquick3d-6.5:6 ) serialport? ( >=dev-qt/qtserialport-6.5:6 ) svg? ( >=dev-qt/qtsvg-6.5:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.5:6 ) websockets? ( >=dev-qt/qtwebsockets-6.5:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui network ) opengl? ( gui ) printsupport? ( gui widgets ) qml? ( network ) quick3d? ( gui qml ) quick? ( gui qml ) spatialaudio? ( multimedia ) sql? ( widgets ) svg? ( gui ) testlib? ( gui widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6/PyQt6-6.5.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b2728b7930cb29dc57a6ebdde8b8f990
+_md5_=cb511bf0d72c262264d9b82f914baeec
diff --git a/metadata/md5-cache/dev-python/PyQt6-sip-13.5.1 b/metadata/md5-cache/dev-python/PyQt6-sip-13.5.1
new file mode 100644
index 000000000000..3c860b36df12
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyQt6-sip-13.5.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=sip module support for PyQt6
+EAPI=8
+HOMEPAGE=https://www.riverbankcomputing.com/software/sip/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 SIP )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/P/PyQt6_sip/PyQt6_sip-13.5.1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ad984bda75e15482f6c8213a6ddad313
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.65.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
new file mode 100644
index 000000000000..4ae577f52550
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.65.0.tar.gz -> serverless-application-model-1.65.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3b51212bb788567e5b2f86181133b284
diff --git a/metadata/md5-cache/dev-python/awxkit-22.1.0 b/metadata/md5-cache/dev-python/awxkit-22.1.0
new file mode 100644
index 000000000000..1d199a5a4c08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awxkit-22.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command line interface for Ansible AWX
+EAPI=8
+HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ansible/awx/archive/22.1.0.tar.gz -> awx-22.1.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b84e9b386712eae8abe79c245fddea47
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.116 b/metadata/md5-cache/dev-python/boto3-1.26.116
new file mode 100644
index 000000000000..06e4035bd6b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.116[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.116.tar.gz -> boto3-1.26.116.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=19c6bcfc191ce918489bff494ff185c2
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.116 b/metadata/md5-cache/dev-python/botocore-1.29.116
new file mode 100644
index 000000000000..db257660913d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.116
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.116.tar.gz -> botocore-1.29.116.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fdf90804b518aea7cdc6e38fa5f2e79b
diff --git a/metadata/md5-cache/dev-python/pychromecast-13.0.6 b/metadata/md5-cache/dev-python/browser-cookie3-0.18.0
similarity index 60%
rename from metadata/md5-cache/dev-python/pychromecast-13.0.6
rename to metadata/md5-cache/dev-python/browser-cookie3-0.18.0
index 43abf8f9bedc..2d6d82a81923 100644
--- a/metadata/md5-cache/dev-python/pychromecast-13.0.6
+++ b/metadata/md5-cache/dev-python/browser-cookie3-0.18.0
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to talk to Google Chromecast
+DESCRIPTION=Loads cookies from your browser into a cookiejar object
 EAPI=8
-HOMEPAGE=https://github.com/home-assistant-libs/pychromecast/ https://pypi.org/project/PyChromecast/
+HOMEPAGE=https://github.com/borisbabic/browser_cookie3/ https://pypi.org/project/browser-cookie3/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.19.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zeroconf-0.25.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+LICENSE=LGPL-3
+RDEPEND=dev-python/dbus-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lz4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/PyChromecast/PyChromecast-13.0.6.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/b/browser-cookie3/browser-cookie3-0.18.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2e89b819a5af80091cadcaf8ffd9041c
+_md5_=86afddf65b73a7f56e9c099888f8ae06
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.77.2 b/metadata/md5-cache/dev-python/cfn-lint-0.77.2
new file mode 100644
index 000000000000..1629529d1036
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.77.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.64.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/networkx-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/regex[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sympy-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/c/cfn-lint/cfn-lint-0.77.2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=568a98f93d062f3e2dd78ccb37890455
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index 7aac3a90f7b5..e8a7889d0fb1 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=df1bc02b22483edeca144370d496a934
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index 0ad7826b0b7c..196dd1e7c91a 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=af6077f776aa5a8c36aee6ad4acd5183
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.1 b/metadata/md5-cache/dev-python/clang-python-16.0.1
index 963139539de6..a0e70e2954ca 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.1
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=54870a9d47888a4dcba05e8fffb23186
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.2 b/metadata/md5-cache/dev-python/clang-python-16.0.2
new file mode 100644
index 000000000000..0a95d676dac6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-16.0.2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test verify-sig python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-16.0.2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=54870a9d47888a4dcba05e8fffb23186
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.2.9999 b/metadata/md5-cache/dev-python/clang-python-16.0.3.9999
similarity index 83%
rename from metadata/md5-cache/dev-python/clang-python-16.0.2.9999
rename to metadata/md5-cache/dev-python/clang-python-16.0.3.9999
index fef009fde9af..13649db4e257 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.2.9999
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.3.9999
@@ -1,6 +1,6 @@
 BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) test? ( sys-devel/clang:16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-16.0.2.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DEPEND=>=sys-devel/clang-16.0.3.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
 DESCRIPTION=Python bindings for sys-devel/clang
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -8,9 +8,9 @@ INHERIT=llvm.org python-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=>=sys-devel/clang-16.0.2.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=sys-devel/clang-16.0.3.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999 b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
index 9ec93022bbd5..9fa482503a82 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-devel/clang-17.0.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !s
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325
index 9ecb60fb4840..cc4dd7ef16fd 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414
index f4ce98eee435..213d1b945c45 100644
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414
+++ b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f7f5fa3c33f07c8d361fc4b9a6dbd9d5
diff --git a/metadata/md5-cache/dev-python/cliff-4.2.0 b/metadata/md5-cache/dev-python/cliff-4.2.0
index ff94f041d4f7..9ddb4a506443 100644
--- a/metadata/md5-cache/dev-python/cliff-4.2.0
+++ b/metadata/md5-cache/dev-python/cliff-4.2.0
@@ -1,4 +1,4 @@
-BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/sphinx[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.1[python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.1[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cliff/cliff-4.2.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=84817f58540c305de864b07b2a4f77c4
+_md5_=1e57adb0bbfc0e0db88e8a5d1a8f1b44
diff --git a/metadata/md5-cache/dev-python/cssutils-2.6.0 b/metadata/md5-cache/dev-python/cssutils-2.6.0
index d54eb41c2a6d..9298a8c8fd1a 100644
--- a/metadata/md5-cache/dev-python/cssutils-2.6.0
+++ b/metadata/md5-cache/dev-python/cssutils-2.6.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/c/cssutils/cssutils-2.6.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a0769312f7b1e8c85f02539b66d99b61
+_md5_=a7d8c67debeea886ce281b5a400e5cae
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.13.1 b/metadata/md5-cache/dev-python/cx_Freeze-6.13.1
index 768d5294d976..9bacb004d5c6 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.13.1
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.13.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Create standalone executables from Python scripts
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
 LICENSE=PYTHON
-RDEPEND=dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+RDEPEND=dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.13.1.tar.gz -> cx_Freeze-6.13.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da6eb52bc82a1cb5cc263f929305bbe4
+_md5_=e1d8fd030781806e857734207e36659a
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.14.5 b/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
index 62bcd9608edb..615f3e03d951 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.14.5
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Create standalone executables from Python scripts
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=PYTHON
-RDEPEND=dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.14.5.tar.gz -> cx_Freeze-6.14.5.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5f92b12e48fc6c7fb3f7746049ff0a5f
+_md5_=f4106f07906791337fa7871a40fbc8f3
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.14.9 b/metadata/md5-cache/dev-python/cx_Freeze-6.14.9
index d809ab4c0ac3..b242cf6d4756 100644
--- a/metadata/md5-cache/dev-python/cx_Freeze-6.14.9
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.14.9
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-arch/rpm dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( app-arch/rpm dev-python/bcrypt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/openpyxl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) dev-util/patchelf virtual/libcrypt:= >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Create standalone executables from Python scripts
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=PYTHON
-RDEPEND=python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) dev-util/patchelf virtual/libcrypt:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.14.9.tar.gz -> cx_Freeze-6.14.9.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5ca3e55bdcae58e560634a2f15c56c05
+_md5_=e41f91dd97eb621df23bdbf53cd1f98c
diff --git a/metadata/md5-cache/dev-python/dask-2023.3.2 b/metadata/md5-cache/dev-python/dask-2023.3.2
index 5e6ff4a95d22..146406ce67e3 100644
--- a/metadata/md5-cache/dev-python/dask-2023.3.2
+++ b/metadata/md5-cache/dev-python/dask-2023.3.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dask/dask/archive/2023.3.2.tar.gz -> dask-2023.3.2.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a1823647b08f5ce9c27de346bd1ed15c
+_md5_=021d5d5f0273c240d29d7a0536c3ede3
diff --git a/metadata/md5-cache/dev-python/dask-2023.4.0 b/metadata/md5-cache/dev-python/dask-2023.4.0
index f74b1462ee81..2caf9de376ef 100644
--- a/metadata/md5-cache/dev-python/dask-2023.4.0
+++ b/metadata/md5-cache/dev-python/dask-2023.4.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/versioneer-0.28[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/versioneer-0.28[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/click-7.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cloudpickle-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.13.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dask/dask/archive/2023.4.0.tar.gz -> dask-2023.4.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5b947cbc08b53953831516626a99d107
+_md5_=49b30ad74ea073dd0c75ba3715706153
diff --git a/metadata/md5-cache/dev-python/diskcache-5.6.1 b/metadata/md5-cache/dev-python/diskcache-5.6.1
new file mode 100644
index 000000000000..f8b15fceff49
--- /dev/null
+++ b/metadata/md5-cache/dev-python/diskcache-5.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/django-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Disk and file backed cache
+EAPI=8
+HOMEPAGE=https://grantjenks.com/docs/diskcache/ https://github.com/grantjenks/python-diskcache/ https://pypi.org/project/diskcache/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/grantjenks/python-diskcache/archive/v5.6.1.tar.gz -> diskcache-5.6.1.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=428b883affda6f88bdadd0b45ab87a84
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.11.7 b/metadata/md5-cache/dev-python/dns-lexicon-3.11.7
index cb905a5b61e5..bbd7936f4d54 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.11.7
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.11.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zeep[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vcrpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tldextract[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zeep[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/vcrpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tldextract[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tldextract[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tldextract[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.11.7.tar.gz -> dns-lexicon-3.11.7.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=927e24461b85ab85f2532d978c00b78e
+_md5_=bb7b1a93ed282426b01b22b8141437f8
diff --git a/metadata/md5-cache/dev-python/filelock-3.12.0 b/metadata/md5-cache/dev-python/filelock-3.12.0
new file mode 100644
index 000000000000..66a25733ff47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/filelock-3.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A platform independent file lock for Python
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/py-filelock/ https://pypi.org/project/filelock/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=Unlicense
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/f/filelock/filelock-3.12.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3680ee5aa2d591847e6d567f913e3ef6
diff --git a/metadata/md5-cache/dev-python/flask-2.2.3 b/metadata/md5-cache/dev-python/flask-2.2.3
index b2d3d193e04c..ab8b6c20a6fb 100644
--- a/metadata/md5-cache/dev-python/flask-2.2.3
+++ b/metadata/md5-cache/dev-python/flask-2.2.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/asgiref-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/shiboken2 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/asgiref-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!dev-python/shiboken2 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-tabs[python_targets_python3_11(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-tabs[python_targets_python3_10(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-tabs[python_targets_python3_9(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-)] dev-python/sphinx-tabs[python_targets_pypy3(-)] dev-python/sphinxcontrib-log_cabinet[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/itsdangerous-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/werkzeug-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/F/Flask/Flask-2.2.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1fe82487c1341ad8ec3ee28686cfc7c6
+_md5_=b516a366412efa67dce02f05e8139e85
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.86.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.86.0
new file mode 100644
index 000000000000..52d939de030c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.86.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pandas[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/httplib2-1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/uritemplate-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/g/google-api-python-client/google-api-python-client-2.86.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=74a574385ee920c8cbc8794ab41a65ef
diff --git a/metadata/md5-cache/dev-python/helpdev-0.7.1-r1 b/metadata/md5-cache/dev-python/helpdev-0.7.1-r1
index 650321988726..196cfb93db09 100644
--- a/metadata/md5-cache/dev-python/helpdev-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/helpdev-0.7.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/h/helpdev/helpdev-0.7.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=27d9d3f20bfb2c7070e3953b3dd76e5f
+_md5_=8fd6a6d7ad122de79813c3748cae5890
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.68.2 b/metadata/md5-cache/dev-python/hypothesis-6.68.2
deleted file mode 100644
index 2d1b011a5af2..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.68.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.68.2.tar.gz -> hypothesis-6.68.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0c18c214578d74873cdf33c899f3c56b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.69.0 b/metadata/md5-cache/dev-python/hypothesis-6.69.0
deleted file mode 100644
index 232e6fafb665..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.69.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.69.0.tar.gz -> hypothesis-6.69.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.70.1 b/metadata/md5-cache/dev-python/hypothesis-6.70.1
deleted file mode 100644
index 352147fd5c75..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.70.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.70.1.tar.gz -> hypothesis-6.70.1.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.70.2 b/metadata/md5-cache/dev-python/hypothesis-6.70.2
deleted file mode 100644
index 265d3a4a1a71..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.70.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.70.2.tar.gz -> hypothesis-6.70.2.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d24acb6f6f27019938b39608b6ce5f4e
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.71.0 b/metadata/md5-cache/dev-python/hypothesis-6.71.0
index f56aa99d56ee..4818fd68f13c 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.71.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.71.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
 INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.71.0.tar.gz -> hypothesis-6.71.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d24acb6f6f27019938b39608b6ce5f4e
+_md5_=74b8b75db521ea4c4ab6dfb5214a2b1e
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.72.0 b/metadata/md5-cache/dev-python/hypothesis-6.72.0
deleted file mode 100644
index fb9f27893ee5..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-6.72.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=8
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.72.0.tar.gz -> hypothesis-6.72.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d24acb6f6f27019938b39608b6ce5f4e
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.70.0 b/metadata/md5-cache/dev-python/hypothesis-6.72.1
similarity index 55%
rename from metadata/md5-cache/dev-python/hypothesis-6.70.0
rename to metadata/md5-cache/dev-python/hypothesis-6.72.1
index 4bf3bff2a9c9..27c7a58a0b41 100644
--- a/metadata/md5-cache/dev-python/hypothesis-6.70.0
+++ b/metadata/md5-cache/dev-python/hypothesis-6.72.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A library for property based testing
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing optfeature
 IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+),sqlite] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.70.0.tar.gz -> hypothesis-6.70.0.gh.tar.gz
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.72.1.tar.gz -> hypothesis-6.72.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=990cdabf0a2222632a46e5fc0ed375f9
+_md5_=04e8bbefff19cc821007fb364b7062ff
diff --git a/metadata/md5-cache/dev-python/iminuit-2.21.3 b/metadata/md5-cache/dev-python/iminuit-2.21.3
new file mode 100644
index 000000000000..76b049a6969e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/iminuit-2.21.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/ipython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipywidgets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/make >=dev-util/cmake-3.20.5 python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Minuit numerical function minimization in Python
+EAPI=8
+HOMEPAGE=https://github.com/scikit-hep/iminuit/ https://pypi.org/project/iminuit/
+INHERIT=cmake distutils-r1 virtualx pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT LGPL-2.1
+RDEPEND=dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/i/iminuit/iminuit-2.21.3.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c033ba7e004d2e2320382fa26851f9ab
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-6.0.1 b/metadata/md5-cache/dev-python/importlib-metadata-6.0.1
similarity index 97%
rename from metadata/md5-cache/dev-python/importlib_metadata-6.0.1
rename to metadata/md5-cache/dev-python/importlib-metadata-6.0.1
index 13efde530604..733ccb55ea84 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-6.0.1
+++ b/metadata/md5-cache/dev-python/importlib-metadata-6.0.1
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-6.0.1.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-metadata/importlib_metadata-6.0.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d4f3b809c35467ca577597c3a8fbd175
+_md5_=6c467bcb0a87a06d3d5a5c6423bf2fd7
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-6.3.0 b/metadata/md5-cache/dev-python/importlib-metadata-6.5.0
similarity index 97%
rename from metadata/md5-cache/dev-python/importlib_metadata-6.3.0
rename to metadata/md5-cache/dev-python/importlib-metadata-6.5.0
index 01863da16b0b..595ffe6febcb 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-6.3.0
+++ b/metadata/md5-cache/dev-python/importlib-metadata-6.5.0
@@ -11,6 +11,6 @@ RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-6.3.0.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-metadata/importlib_metadata-6.5.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ae68081e0e7476f0b50da8aa1e7eb5eb
+_md5_=3cf2e0147b8ce32c0c2d9e321d1a5ada
diff --git a/metadata/md5-cache/dev-python/importlib_resources-5.12.0 b/metadata/md5-cache/dev-python/importlib-resources-5.12.0
similarity index 82%
rename from metadata/md5-cache/dev-python/importlib_resources-5.12.0
rename to metadata/md5-cache/dev-python/importlib-resources-5.12.0
index 5e901f404bb6..25b075fd9d2e 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-5.12.0
+++ b/metadata/md5-cache/dev-python/importlib-resources-5.12.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Read resources from Python packages
 EAPI=7
 HOMEPAGE=https://github.com/python/importlib_resources/ https://pypi.org/project/importlib-resources/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/zipp-3.7.0-r1[python_targets_pypy3(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/python/importlib_resources/archive/v5.12.0.tar.gz -> importlib_resources-5.12.0.gh.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3d859da8b34061ad9153b0cb22e96147
+SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib-resources/importlib_resources-5.12.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f4ac75857764d2e0185c08bd291d8db9
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-6.4.1 b/metadata/md5-cache/dev-python/importlib_metadata-6.4.1
deleted file mode 100644
index 44ae55ffaac8..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-6.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyfakefs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://github.com/python/importlib_metadata/ https://pypi.org/project/importlib-metadata/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-6.4.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ae68081e0e7476f0b50da8aa1e7eb5eb
diff --git a/metadata/md5-cache/dev-python/jsonschema-4.17.3 b/metadata/md5-cache/dev-python/jsonschema-4.17.3
index 80a94521bbde..803d7ab5ace3 100644
--- a/metadata/md5-cache/dev-python/jsonschema-4.17.3
+++ b/metadata/md5-cache/dev-python/jsonschema-4.17.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jsonschema/jsonschema-4.17.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d5a760deb52a01d28bc21bf4f0716c21
+_md5_=34bee54cb1438248427dc1501765185b
diff --git a/metadata/md5-cache/dev-python/jupyter-client-8.0.3 b/metadata/md5-cache/dev-python/jupyter-client-8.0.3
index c5400e36ff9a..5ed69c65db01 100644
--- a/metadata/md5-cache/dev-python/jupyter-client-8.0.3
+++ b/metadata/md5-cache/dev-python/jupyter-client-8.0.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-client/jupyter_client-8.0.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=694e7273f7a7060280b333262f9ef083
+_md5_=129e14b940eb492c762f83986577dc53
diff --git a/metadata/md5-cache/dev-python/jupyter-client-8.1.0 b/metadata/md5-cache/dev-python/jupyter-client-8.1.0
index 97656e93ea4a..93c20b6e9df4 100644
--- a/metadata/md5-cache/dev-python/jupyter-client-8.1.0
+++ b/metadata/md5-cache/dev-python/jupyter-client-8.1.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-client/jupyter_client-8.1.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4cdefe3596184b7b09da1a31e8568276
+_md5_=fcc37d87c95f5706bdb0a0390cb03f34
diff --git a/metadata/md5-cache/dev-python/jupyter-client-8.2.0 b/metadata/md5-cache/dev-python/jupyter-client-8.2.0
index e1f236a0d23a..58165f6ac75e 100644
--- a/metadata/md5-cache/dev-python/jupyter-client-8.2.0
+++ b/metadata/md5-cache/dev-python/jupyter-client-8.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/ipykernel-6.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-jupyter-0.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Jupyter protocol implementation and client libraries
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=>=dev-python/jupyter-core-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-client/jupyter_client-8.2.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6e5b10956a4b552a4787a4b045af4a8d
+_md5_=92dfa130a4f637c5a1fdc6e2651ee139
diff --git a/metadata/md5-cache/dev-python/jupyter-lsp-2.0.1 b/metadata/md5-cache/dev-python/jupyter-lsp-2.0.1
index 363b16baca23..822060ed3cec 100644
--- a/metadata/md5-cache/dev-python/jupyter-lsp-2.0.1
+++ b/metadata/md5-cache/dev-python/jupyter-lsp-2.0.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 optfeature pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/entrypoints[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-lsp/jupyter-lsp-2.0.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=53555bf60b5bc7b3a2732442f39b7cab
+_md5_=ef224839497f1d0ff6956311e3e4f372
diff --git a/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0 b/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
index 2c94a427e6c5..241c435cabb2 100644
--- a/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websockets-10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/websockets-10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/ypy-websocket-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Document structures for collaborative editing using Ypy
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/y-py-0.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/y-py-0.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter-server/jupyter_ydoc/archive/refs/tags/v1.0.0.tar.gz -> jupyter_ydoc-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4cfd11c57f56b5e40f9122b7780cd6d2
+_md5_=fc568e35d89c45ff0f368134569605fa
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.22.0 b/metadata/md5-cache/dev-python/jupyterlab-server-2.22.0
index d38aabc26fee..22b34654f68a 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.22.0
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.22.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.22.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a28e4aa4c33275ff9e7bc4594bf7d0f6
+_md5_=c4c89ee62870545930a6d98ff4ac8098
diff --git a/metadata/md5-cache/dev-python/jupyterlab-server-2.22.1 b/metadata/md5-cache/dev-python/jupyterlab-server-2.22.1
index a5ff36e6fc83..faedfffeffca 100644
--- a/metadata/md5-cache/dev-python/jupyterlab-server-2.22.1
+++ b/metadata/md5-cache/dev-python/jupyterlab-server-2.22.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter-server[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-core-0.17[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-core-0.16.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-spec-validator-0.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-jupyter[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-tornasync[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Server components for JupyterLab and JupyterLab like applications
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/Babel-2.10[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/json5-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.28[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-server-1.21[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jupyter-server-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8.3[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyterlab-server/jupyterlab_server-2.22.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a28e4aa4c33275ff9e7bc4594bf7d0f6
+_md5_=c4c89ee62870545930a6d98ff4ac8098
diff --git a/metadata/md5-cache/dev-python/keyring-23.13.1-r1 b/metadata/md5-cache/dev-python/keyring-23.13.1-r1
index 59e3db1cfd84..ea9f29c37ef7 100644
--- a/metadata/md5-cache/dev-python/keyring-23.13.1-r1
+++ b/metadata/md5-cache/dev-python/keyring-23.13.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Provides access to the system keyring service
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=PSF-2
-RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/importlib_metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-classes[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/importlib-metadata-4.11.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/k/keyring/keyring-23.13.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9dda840493f2c5e101973c59106db7c7
+_md5_=894a845beb1903f0ac05b332e9fa4397
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 1ae5d939cc81..c8d6c58e10b4 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=67d902868be793a5cb25a3d9aae6cdef
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index dbe15d00a4c3..92076d1cd9cd 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=05fe9b9d4b376809fb1d6ef6ed35e15b
diff --git a/metadata/md5-cache/dev-python/lit-16.0.1 b/metadata/md5-cache/dev-python/lit-16.0.1
index 115cc2de0877..e25132353591 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.1
+++ b/metadata/md5-cache/dev-python/lit-16.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=997bc0ae1ca46b80dad712ff6f6827ba
diff --git a/metadata/md5-cache/dev-python/lit-16.0.2 b/metadata/md5-cache/dev-python/lit-16.0.2
new file mode 100644
index 000000000000..c02e455db3bc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-16.0.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=distutils-r1 llvm.org
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=997bc0ae1ca46b80dad712ff6f6827ba
diff --git a/metadata/md5-cache/dev-python/lit-16.0.2.9999 b/metadata/md5-cache/dev-python/lit-16.0.3.9999
similarity index 93%
rename from metadata/md5-cache/dev-python/lit-16.0.2.9999
rename to metadata/md5-cache/dev-python/lit-16.0.3.9999
index 840707e889d0..f176d0e862b7 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.2.9999
+++ b/metadata/md5-cache/dev-python/lit-16.0.3.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0.9999 b/metadata/md5-cache/dev-python/lit-17.0.0.9999
index 840707e889d0..f176d0e862b7 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-17.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230325 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230325
index 1f786851f4f8..4e0e8051cc27 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230325
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230325
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230414 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230414
index 95a3228b1ad6..8931d60514ea 100644
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230414
+++ b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230414
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=6ab6908d2507a09df6acd7c92d7ec4ed
diff --git a/metadata/md5-cache/dev-python/looseversion-1.1.2 b/metadata/md5-cache/dev-python/looseversion-1.1.2
new file mode 100644
index 000000000000..b3f26f6e50dd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/looseversion-1.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A backwards/forwards-compatible fork of distutils.version.LooseVersion
+EAPI=8
+HOMEPAGE=https://pypi.org/project/looseversion/ https://github.com/effigies/looseversion
+INHERIT=pypi distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=PSF-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/l/looseversion/looseversion-1.1.2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e14947949b788b3bf4ff172444a21c5f
diff --git a/metadata/md5-cache/dev-python/markdown-3.3.7 b/metadata/md5-cache/dev-python/markdown-3.3.7
index 3c95dcb69e54..e7c3af5670ec 100644
--- a/metadata/md5-cache/dev-python/markdown-3.3.7
+++ b/metadata/md5-cache/dev-python/markdown-3.3.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of the markdown markup language
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.3.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=54952928d0277535ed104a1b94414ddb
+_md5_=41a5c1c196780709a59ba3eed0aac8c6
diff --git a/metadata/md5-cache/dev-python/markdown-3.4.1 b/metadata/md5-cache/dev-python/markdown-3.4.1
index db4ae5f807eb..b04fe9aad73c 100644
--- a/metadata/md5-cache/dev-python/markdown-3.4.1
+++ b/metadata/md5-cache/dev-python/markdown-3.4.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of the markdown markup language
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.4.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7c757cf8771d1350d78e48464f22968a
+_md5_=8e8febc7080a0ca50d4b9609255186e2
diff --git a/metadata/md5-cache/dev-python/markdown-3.4.3 b/metadata/md5-cache/dev-python/markdown-3.4.3
index 9c4357ff2607..f5edae8d1d7f 100644
--- a/metadata/md5-cache/dev-python/markdown-3.4.3
+++ b/metadata/md5-cache/dev-python/markdown-3.4.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of the markdown markup language
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_pypy3? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-3.4.3.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=30815da5a3007cab31171aa97376d882
+_md5_=d02b96a724f75c4cd446ec13786a3dd6
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.7.0 b/metadata/md5-cache/dev-python/matplotlib-3.7.0
index 9d7cd98cf7c8..5f0c2f99fda5 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.7.0
+++ b/metadata/md5-cache/dev-python/matplotlib-3.7.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 flag-o-matic multiprocessing prefix pypi toolchain-funcs vi
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
+RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-3.7.0.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=b3afd48bb49490bd8e4b65cc60754cf2
+_md5_=84e38fbae032bc8f68545ca0d8cbb5f0
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.7.1 b/metadata/md5-cache/dev-python/matplotlib-3.7.1
index 91f397c32d8a..70ceebc08eb8 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.7.1
+++ b/metadata/md5-cache/dev-python/matplotlib-3.7.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/setuptools-scm-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig doc? ( >=app-text/dvipng-1.15-r1 >=dev-python/colorspacious-1.1.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-1.18.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpydoc-0.9.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-gallery-0.3.1-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/xlwt-1.3.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/latex-base dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended dev-texlive/texlive-luatex dev-texlive/texlive-xetex >=media-gfx/graphviz-2.42.3[cairo] ) test? ( dev-python/mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) test? ( dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 flag-o-matic multiprocessing prefix pypi toolchain-funcs vi
 IUSE=cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib_resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
+RDEPEND=dev-python/certifi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/contourpy-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cycler-0.10.0-r1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fonttools-4.22.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/kiwisolver-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-7.1.1[jpeg,webp,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-fonts/dejavu media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013:= virtual/imagemagick-tools[jpeg,tiff] python_targets_python3_9? ( dev-python/importlib-resources[python_targets_python3_9(-)?] ) cairo? ( dev-python/cairocffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) excel? ( dev-python/xlwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) gtk3? ( >=dev-python/pygobject-3.40.1-r1:3[cairo?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/dvipng app-text/ghostscript-gpl app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-luatex dev-texlive/texlive-xetex ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) webagg? ( >=dev-python/tornado-6.0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) wxwidgets? ( python_targets_python3_9? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/wxpython:*[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[tk?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[tk?,threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-3.7.1.tar.gz test? ( https://downloads.sourceforge.net/project/freetype/freetype2/2.6.1/freetype-2.6.1.tar.gz )
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=9cbb1b29a6df733efae8828d200b4fb5
+_md5_=0c8388de17020b6927c6556ced55ce01
diff --git a/metadata/md5-cache/dev-python/matrix-common-1.3.0 b/metadata/md5-cache/dev-python/matrix-common-1.3.0
index 92a26394577f..dbf0c1e941a5 100644
--- a/metadata/md5-cache/dev-python/matrix-common-1.3.0
+++ b/metadata/md5-cache/dev-python/matrix-common-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Common code for Synapse, Sydent and Sygnal
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/attrs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/matrix-python-common/archive/v1.3.0.tar.gz -> matrix-common-1.3.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2d7933ad487e79373acee66119126b1a
+_md5_=0408d16a923b716c23d5e6cfc3597118
diff --git a/metadata/md5-cache/dev-python/meson-python-0.13.0 b/metadata/md5-cache/dev-python/meson-python-0.13.0
new file mode 100644
index 000000000000..b1b291f55d07
--- /dev/null
+++ b/metadata/md5-cache/dev-python/meson-python-0.13.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/cython-0.29.34[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/GitPython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/typing-extensions-3.7.4[python_targets_python3_9(-)?] ) ) test? ( >=dev-python/pyproject-metadata-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/meson-0.63.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Meson PEP 517 Python build backend
+EAPI=8
+HOMEPAGE=https://pypi.org/project/meson-python/ https://github.com/mesonbuild/meson-python/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pyproject-metadata-0.7.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/meson-0.63.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-util/patchelf python_targets_python3_9? ( >=dev-python/tomli-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mesonbuild/meson-python/archive/0.13.0.tar.gz -> meson-python-0.13.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=30f890a584e2be4417e6b2a257ea6563
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.4.2 b/metadata/md5-cache/dev-python/mkdocs-1.4.2
index f52aae5dd027..92acc99408dd 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.4.2
+++ b/metadata/md5-cache/dev-python/mkdocs-1.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/Babel-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/Babel-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Project documentation with Markdown
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD
-RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/Babel-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/click-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.3.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/markdown-3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/watchdog-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ghp-import-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml_env_tag-0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-4.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mergedeep-1.3.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mkdocs/mkdocs/archive/1.4.2.tar.gz -> mkdocs-1.4.2.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8f689f708616b402e1a4a61e6c1e34e1
+_md5_=dfb94472aaa4d8da4c94a67bf3fa3b34
diff --git a/metadata/md5-cache/dev-python/mss-9.0.0 b/metadata/md5-cache/dev-python/mss-9.0.0
new file mode 100644
index 000000000000..694fd32eab80
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mss-9.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-rerunfailures[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyvirtualdisplay[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An ultra fast cross-platform multiple screenshots module in python using ctypes
+EAPI=8
+HOMEPAGE=https://github.com/BoboTiG/python-mss/ https://pypi.org/project/mss/
+INHERIT=distutils-r1 pypi virtualx
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mss/mss-9.0.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
+_md5_=f2ce0be409ecef62355f258d0a196aa4
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.2.10-r1 b/metadata/md5-cache/dev-python/nbconvert-7.2.10-r1
index 717fe085f339..c81d00af5236 100644
--- a/metadata/md5-cache/dev-python/nbconvert-7.2.10-r1
+++ b/metadata/md5-cache/dev-python/nbconvert-7.2.10-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing pypi virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86
 LICENSE=BSD
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.2.10.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=f255ba3f0c0a0c31351520086814caac
+_md5_=43976be8a2710d8704aa979525ad09fc
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.2.9 b/metadata/md5-cache/dev-python/nbconvert-7.2.9
index b5e1a31b3290..34e21bdaf494 100644
--- a/metadata/md5-cache/dev-python/nbconvert-7.2.9
+++ b/metadata/md5-cache/dev-python/nbconvert-7.2.9
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/notebook[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-7.2.9.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=ee08e6371feebb93f88f2be120cc5a07
+_md5_=6bc386edf1c0eb76408e8a236235c320
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.3.0 b/metadata/md5-cache/dev-python/nbconvert-7.3.0
index 9e4fd8cac3a0..7a53adfe34b4 100644
--- a/metadata/md5-cache/dev-python/nbconvert-7.3.0
+++ b/metadata/md5-cache/dev-python/nbconvert-7.3.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing pypi virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~riscv ~x86
 LICENSE=BSD
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.3.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=bc06d74cc01c9c3f59ad6fcc6909e51d
+_md5_=e1a0fb02407f7109019d62002981c277
diff --git a/metadata/md5-cache/dev-python/nbconvert-7.3.1 b/metadata/md5-cache/dev-python/nbconvert-7.3.1
index 5795e68c12b6..a24a4813d0c9 100644
--- a/metadata/md5-cache/dev-python/nbconvert-7.3.1
+++ b/metadata/md5-cache/dev-python/nbconvert-7.3.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipywidgets-7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Converting Jupyter Notebooks
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 multiprocessing pypi virtualx
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
-RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/defusedxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) >=dev-python/jinja-3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter-core-4.7[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyterlab_pygments[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markupsafe-2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mistune-2.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclient-0.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbformat-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandocfilters-1.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tinycss2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nbconvert/nbconvert-7.3.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=efe0f06f302fc04ccc73500afa780399
+_md5_=d261c3e1bb2b8772ead7947267a8da60
diff --git a/metadata/md5-cache/dev-python/nspektr-0.4.0 b/metadata/md5-cache/dev-python/nspektr-0.4.0
index b2fbf53e3adf..a3f52f8c980b 100644
--- a/metadata/md5-cache/dev-python/nspektr-0.4.0
+++ b/metadata/md5-cache/dev-python/nspektr-0.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/jaraco-context-4.1.1-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/jaraco-context-4.1.1-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Distribution package dependency inspector
 EAPI=7
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-python/jaraco-context-4.1.1-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/jaraco-context-4.1.1-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/nspektr/nspektr-0.4.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=da02410087859673f9260d48018d09b1
+_md5_=bec12d9425dbe67e691b22813f80e40c
diff --git a/metadata/md5-cache/dev-python/openstacksdk-1.0.1 b/metadata/md5-cache/dev-python/openstacksdk-1.0.1
index a98e307bf519..55ea81a4a6b6 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-1.0.1
+++ b/metadata/md5-cache/dev-python/openstacksdk-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpatch-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/ddt-1.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/prometheus_client-0.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-config-6.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/statsd-3.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpatch-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A collection of libraries for building applications to work with OpenStack
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpatch-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonpatch-1.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keystoneauth1-3.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/openstacksdk/openstacksdk-1.0.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f92b9ce5269422a8c272c6bfb96d906e
+_md5_=2705db97f565143a9bb93e14dfa29396
diff --git a/metadata/md5-cache/dev-python/oslo-config-9.1.1 b/metadata/md5-cache/dev-python/oslo-config-9.1.1
index ee0bdb5d5d43..80a051e5ceca 100644
--- a/metadata/md5-cache/dev-python/oslo-config-9.1.1
+++ b/metadata/md5-cache/dev-python/oslo-config-9.1.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslotest-3.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-mock-1.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testscenarios-0.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Oslo Configuration API
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib_metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.18.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/importlib-metadata[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-9.1.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b80823347b836e73cccf6c69f46242c
+_md5_=83cc5447dab1d3c5c941ef5e67549389
diff --git a/metadata/md5-cache/dev-python/peewee-3.16.1 b/metadata/md5-cache/dev-python/peewee-3.16.1
new file mode 100644
index 000000000000..fac702f25c5b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.16.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=native-extensions? ( dev-db/sqlite:3= )
+DESCRIPTION=Small Python ORM
+EAPI=8
+HOMEPAGE=https://github.com/coleifer/peewee/ https://pypi.org/project/peewee/
+INHERIT=distutils-r1
+IUSE=examples +native-extensions test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=native-extensions? ( dev-db/sqlite:3= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/coleifer/peewee/archive/3.16.1.tar.gz -> peewee-3.16.1.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=7688cc07a08f33b8a14289e480b0418f
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.13.10 b/metadata/md5-cache/dev-python/phonenumbers-8.13.10
new file mode 100644
index 000000000000..6b63ec6d5474
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.13.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/daviddrysdale/python-phonenumbers/archive/v8.13.10.tar.gz -> python-phonenumbers-8.13.10.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=9b8f3b2374a55d266fd419ad82f42ed3
diff --git a/metadata/md5-cache/dev-python/pip-run-10.0.5-r1 b/metadata/md5-cache/dev-python/pip-run-10.0.5-r1
index 9c59093610f6..a5ef6701b125 100644
--- a/metadata/md5-cache/dev-python/pip-run-10.0.5-r1
+++ b/metadata/md5-cache/dev-python/pip-run-10.0.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pip-run/pip-run-10.0.5.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1c1ad43a3620791c7661be0db9be993b
+_md5_=9933cd96f617a84617595ab7f2540047
diff --git a/metadata/md5-cache/dev-python/pip-run-10.0.7 b/metadata/md5-cache/dev-python/pip-run-10.0.7
index 46a6600744db..28ad8989b69b 100644
--- a/metadata/md5-cache/dev-python/pip-run-10.0.7
+++ b/metadata/md5-cache/dev-python/pip-run-10.0.7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pip-run/pip-run-10.0.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=808cdb76a20ec6b76823ebcfe21c231d
+_md5_=6614f9fc47219c9ed1d6f56a2f8249b5
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.10 b/metadata/md5-cache/dev-python/podcastparser-0.6.10
new file mode 100644
index 000000000000..c2815183310a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Podcast parser for the gpodder client
+EAPI=8
+HOMEPAGE=https://github.com/gpodder/podcastparser/ https://pypi.org/project/podcastparser/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/podcastparser/podcastparser-0.6.10.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=38253ef9d80a136b5d717a776b9b6678
diff --git a/metadata/md5-cache/dev-python/psutil-5.9.5 b/metadata/md5-cache/dev-python/psutil-5.9.5
new file mode 100644
index 000000000000..28b5699437c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.9.5
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=8
+HOMEPAGE=https://github.com/giampaolo/psutil/ https://pypi.org/project/psutil/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/psutil/psutil-5.9.5.tar.gz https://dev.gentoo.org/~mgorny/dist/psutil-5.9.5-tests.patch.xz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5e7dd782b5da82cde8fbfe63791a95cb
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.2 b/metadata/md5-cache/dev-python/pyacoustid-1.2.2
deleted file mode 100644
index 044a5398e6b2..000000000000
--- a/metadata/md5-cache/dev-python/pyacoustid-1.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings for Chromaprint and the AcoustID web service
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pyacoustid/
-INHERIT=distutils-r1
-IUSE=examples python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/audioread[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/chromaprint python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.2.2.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ba515536264d92b1a223541660f86fc7
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1 b/metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1
index a4c013cf7391..9905911ab344 100644
--- a/metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pyacoustid/
 INHERIT=distutils-r1 pypi
 IUSE=examples test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT test? ( CC-BY-SA-4.0 )
 PROPERTIES=test_network
 RDEPEND=dev-python/audioread[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,ffmpeg] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/chromaprint python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/p/pyacoustid/pyacoustid-1.2.2.tar.gz test? ( https://s3.wasabisys.com/blocsonic/releases/maxblocs/bsmx0198/01-Follow_192kb.mp3 -> pyacoustid-test.mp3 )
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3bf93042d752ae5e39cefbd9dfa5d506
+_md5_=c50930a0a02f448848b2bb3ab8e8533e
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.5.0 b/metadata/md5-cache/dev-python/pyasn1-0.5.0
new file mode 100644
index 000000000000..cc1021f25119
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-python/pypy3-7.3.11-r1:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ASN.1 library for Python
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyasn1/ https://github.com/etingof/pyasn1/
+INHERIT=distutils-r1 pypi
+IUSE=test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasn1/pyasn1-0.5.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=83596061c6ca443afc9fd0d55183187b
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0 b/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
new file mode 100644
index 000000000000..b8c90becc984
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( <dev-python/pyasn1-0.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pyasn1 modules
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyasn1-modules/ https://github.com/etingof/pyasn1-modules/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD-2
+RDEPEND=<dev-python/pyasn1-0.6.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.4.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyasn1-modules/pyasn1_modules-0.3.0.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=53c61a7395ec73d051305e0a7afa557f
diff --git a/metadata/md5-cache/dev-python/pychromecast-13.0.4 b/metadata/md5-cache/dev-python/pychromecast-13.0.4
deleted file mode 100644
index 26f7d7b8da86..000000000000
--- a/metadata/md5-cache/dev-python/pychromecast-13.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to talk to Google Chromecast
-EAPI=8
-HOMEPAGE=https://github.com/home-assistant-libs/pychromecast/ https://pypi.org/project/PyChromecast/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.19.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zeroconf-0.25.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/P/PyChromecast/PyChromecast-13.0.4.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=541bfc0157c0549f304481912ce82918
diff --git a/metadata/md5-cache/dev-python/pychromecast-13.0.7 b/metadata/md5-cache/dev-python/pychromecast-13.0.7
index 9766dd2eb533..188c6a9b6449 100644
--- a/metadata/md5-cache/dev-python/pychromecast-13.0.7
+++ b/metadata/md5-cache/dev-python/pychromecast-13.0.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/home-assistant-libs/pychromecast/ https://pypi.org/project/PyChromecast/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/casttube-0.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.19.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/zeroconf-0.25.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/P/PyChromecast/PyChromecast-13.0.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2e89b819a5af80091cadcaf8ffd9041c
+_md5_=6107b6c46942abffd3d84e868724e65f
diff --git a/metadata/md5-cache/dev-python/pygments-2.15.1 b/metadata/md5-cache/dev-python/pygments-2.15.1
new file mode 100644
index 000000000000..473b4d68d157
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygments-2.15.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcag-contrast-ratio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/ttf-fonts ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pygments is a syntax highlighting package written in Python
+EAPI=8
+HOMEPAGE=https://pygments.org/ https://github.com/pygments/pygments/ https://pypi.org/project/Pygments/
+INHERIT=distutils-r1 bash-completion-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-2.15.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=ffd2598711abf5074c77324ee13abcf9
diff --git a/metadata/md5-cache/dev-python/pyside6-6.5.0 b/metadata/md5-cache/dev-python/pyside6-6.5.0
new file mode 100644
index 000000000000..d652a301ea06
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyside6-6.5.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken6-6.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtbase-6.5*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] charts? ( =dev-qt/qtcharts-6.5*:6 ) designer? ( =dev-qt/qttools-6.5*:6[designer] ) gui? ( =dev-qt/qtbase-6.5*:6[gui,jpeg] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.5*:6[assistant] ) multimedia? ( =dev-qt/qtmultimedia-6.5*:6 ) network-auth? ( =dev-qt/qtnetworkauth-6.5*:6 ) positioning? ( =dev-qt/qtpositioning-6.5*:6 ) printsupport? ( =dev-qt/qtbase-6.5*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.5*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.5*:6 ) serialport? ( =dev-qt/qtserialport-6.5*:6 ) svg? ( =dev-qt/qtsvg-6.5*:6 ) testlib? ( =dev-qt/qtbase-6.5*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.5*:6 ) webengine? ( =dev-qt/qtwebengine-6.5*:6[widgets?] ) websockets? ( =dev-qt/qtwebsockets-6.5*:6 ) test? ( =dev-qt/qtbase-6.5*:6[gui] )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake python-r1 virtualx
+IUSE=+dbus charts +concurrent designer gles2-only +gui help multimedia +network network-auth +opengl positioning +printsupport qml quick quick3d serialport +sql svg test +testlib webchannel webengine websockets +widgets +xml python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/shiboken6-6.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-qt/qtbase-6.5*:6[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] charts? ( =dev-qt/qtcharts-6.5*:6 ) designer? ( =dev-qt/qttools-6.5*:6[designer] ) gui? ( =dev-qt/qtbase-6.5*:6[gui,jpeg] x11-libs/libxkbcommon ) help? ( =dev-qt/qttools-6.5*:6[assistant] ) multimedia? ( =dev-qt/qtmultimedia-6.5*:6 ) network-auth? ( =dev-qt/qtnetworkauth-6.5*:6 ) positioning? ( =dev-qt/qtpositioning-6.5*:6 ) printsupport? ( =dev-qt/qtbase-6.5*:6[gui,widgets] ) qml? ( =dev-qt/qtdeclarative-6.5*:6[widgets?] ) quick3d? ( =dev-qt/qtquick3d-6.5*:6 ) serialport? ( =dev-qt/qtserialport-6.5*:6 ) svg? ( =dev-qt/qtsvg-6.5*:6 ) testlib? ( =dev-qt/qtbase-6.5*:6[gui] ) webchannel? ( =dev-qt/qtwebchannel-6.5*:6 ) webengine? ( =dev-qt/qtwebengine-6.5*:6[widgets?] ) websockets? ( =dev-qt/qtwebsockets-6.5*:6 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) charts? ( gui widgets ) designer? ( widgets ) gles2-only? ( gui ) gui? ( dbus opengl ) help? ( network sql widgets ) multimedia? ( gui network ) network-auth? ( network ) opengl? ( gui ) printsupport? ( widgets ) qml? ( network ) quick? ( gui network opengl qml ) quick3d? ( gui network opengl qml quick ) sql? ( widgets ) svg? ( gui ) testlib? ( widgets ) webchannel? ( qml ) webengine? ( network gui printsupport quick webchannel ) websockets? ( network ) widgets? ( gui )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.5.0-src/pyside-setup-everywhere-src-6.5.0.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1bf6c9448853a445cae14ee0fdc1f6fb
diff --git a/metadata/md5-cache/dev-python/pyside6-tools-6.5.0 b/metadata/md5-cache/dev-python/pyside6-tools-6.5.0
new file mode 100644
index 000000000000..56205333471c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyside6-tools-6.5.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside6-6.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=PySide development tools (pyside6-lupdate with support for Python)
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake python-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~dev-python/pyside6-6.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.5.0-src/pyside-setup-everywhere-src-6.5.0.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=027e51af0f9d9c597f4bb3dca17bbb88
diff --git a/metadata/md5-cache/dev-python/pytest-custom-exit-code-0.3.0 b/metadata/md5-cache/dev-python/pytest-custom-exit-code-0.3.0
new file mode 100644
index 000000000000..be5dc66653c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-custom-exit-code-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Exit pytest test session with custom exit code in different scenarios
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pytest-custom-exit-code/ https://github.com/yashtodi94/pytest-custom_exit_code
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-7.0.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yashtodi94/pytest-custom_exit_code/archive/refs/tags/0.3.0.tar.gz -> pytest-custom-exit-code-0.3.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=94f46a01921c7c7ba477ce1477294abb
diff --git a/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc23 b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc23
new file mode 100644
index 000000000000..cc341ec519b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc23
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/attrs[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/docker-py[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_10(-)?] test? ( dev-python/pyfakefs[python_targets_python3_10(-)?] dev-python/pytest-subtests[python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/docker-py[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_10(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The new generation of the pytest-salt Plugin
+EAPI=8
+HOMEPAGE=https://github.com/saltstack/pytest-salt-factories
+INHERIT=distutils-r1
+IUSE=test test python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/attrs[python_targets_python3_10(-)?] dev-python/pytest-tempdir[python_targets_python3_10(-)?] dev-python/docker-py[python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_10(-)?] dev-python/pytest-system-statistics[python_targets_python3_10(-)?] >=dev-python/pytest-shell-utilities-1.4.0[python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_10(-)?] >=app-admin/salt-3001.0[python_targets_python3_10(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/saltstack/pytest-salt-factories/archive/1.0.0rc23.tar.gz -> pytest-salt-factories-1.0.0_rc23.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=5a987711abe9950b7b1504b39ed7ce88
diff --git a/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2 b/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
new file mode 100644
index 000000000000..2f832b523655
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A robust email syntax and deliverability validation library
+EAPI=8
+HOMEPAGE=https://github.com/JoshData/python-email-validator/ https://pypi.org/project/email-validator/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=CC0-1.0
+RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/e/email-validator/email_validator-2.0.0.post2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=51dfffad11c6be98811559b8b9520732
diff --git a/metadata/md5-cache/dev-python/python-engineio-4.4.1 b/metadata/md5-cache/dev-python/python-engineio-4.4.1
new file mode 100644
index 000000000000..7ab1aefe84ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-engineio-4.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/tornado[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websockets[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/alabaster[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the Engine.IO realtime server
+EAPI=8
+HOMEPAGE=https://python-engineio.readthedocs.io/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/aiohttp[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/websocket-client[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/miguelgrinberg/python-engineio/archive/v4.4.1.tar.gz -> python-engineio-4.4.1.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e12d11a5485fb0f6a8c7784468f910ce
diff --git a/metadata/md5-cache/dev-python/python-vlc-3.0.18122 b/metadata/md5-cache/dev-python/python-vlc-3.0.18122
new file mode 100644
index 000000000000..d27813d5f982
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-vlc-3.0.18122
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python ctypes-based bindings for libvlc
+EAPI=8
+HOMEPAGE=https://github.com/oaubert/python-vlc https://wiki.videolan.org/Python_bindings/
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+RDEPEND=media-video/vlc python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-vlc/python-vlc-3.0.18122.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1a8806ccb9599ef79c8fa781a3d1bfba
diff --git a/metadata/md5-cache/dev-python/setuptools-67.6.1 b/metadata/md5-cache/dev-python/setuptools-67.6.1
index 5546c39c665f..277dcd8f6196 100644
--- a/metadata/md5-cache/dev-python/setuptools-67.6.1
+++ b/metadata/md5-cache/dev-python/setuptools-67.6.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) >=dev-python/wheel-0.37.1-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_pypy3? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ini2toml-0.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-envs-2.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-path-3.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip-run[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of extensions to Distutils
 EAPI=8
@@ -8,10 +8,10 @@ IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_1
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
+RDEPEND=>=dev-python/jaraco-text-3.7.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-8.12.0-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nspektr-0.3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ordered-set-4.0.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3-r2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6.2-r1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.11.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/setuptools/setuptools-67.6.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2f046e76c5c421fe897ece313e876954
+_md5_=d7b21d48da6747ffb00416b47f9737d3
diff --git a/metadata/md5-cache/dev-python/shiboken6-6.5.0 b/metadata/md5-cache/dev-python/shiboken6-6.5.0
new file mode 100644
index 000000000000..e975612a40ff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/shiboken6-6.5.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtbase-6.5*:6 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qtbase-6.5*:6[gui] ) !!sys-devel/llvm:0
+DESCRIPTION=Python binding generator for C++ libraries
+EAPI=8
+HOMEPAGE=https://wiki.qt.io/PySide6
+INHERIT=cmake llvm python-r1 toolchain-funcs
+IUSE=+docstrings numpy test vulkan python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) =dev-qt/qtbase-6.5*:6 <sys-devel/clang-16:= <sys-devel/clang-runtime-16:= docstrings? ( >=dev-libs/libxml2-2.6.32 >=dev-libs/libxslt-1.1.19 ) numpy? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) vulkan? ( dev-util/vulkan-headers )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.5.0-src/pyside-setup-everywhere-src-6.5.0.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=69a3c5855a8f7ba24e60b5eab454f124
diff --git a/metadata/md5-cache/dev-python/signedjson-1.1.4 b/metadata/md5-cache/dev-python/signedjson-1.1.4
index 45ab7e3a63bc..5cab6b15757a 100644
--- a/metadata/md5-cache/dev-python/signedjson-1.1.4
+++ b/metadata/md5-cache/dev-python/signedjson-1.1.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Signs JSON objects with ED25519 signatures.
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=dev-python/canonicaljson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/python-signedjson/archive/v1.1.4.tar.gz -> signedjson-1.1.4.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7059c2e14c5ce32c66b29be87af37b2c
+_md5_=f623879d8e740cf9ffee6d6808fa0dc5
diff --git a/metadata/md5-cache/dev-python/sphinx-4.5.0-r1 b/metadata/md5-cache/dev-python/sphinx-4.5.0-r1
index 4c0e9523eafc..edcba5fa3ef7 100644
--- a/metadata/md5-cache/dev-python/sphinx-4.5.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx-4.5.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python documentation generator
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-4.5.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ee3797281a43179fec8934d36a059c52
+_md5_=6a08dd09f4038f0f2fdde5a8231d867f
diff --git a/metadata/md5-cache/dev-python/sphinx-5.3.0 b/metadata/md5-cache/dev-python/sphinx-5.3.0
index efdabf116736..8f0cb0f4e51f 100644
--- a/metadata/md5-cache/dev-python/sphinx-5.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-5.3.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( app-text/dvipng dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex virtual/imagemagick-tools[jpeg,png,svg] ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( app-text/dvipng dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex virtual/imagemagick-tools[jpeg,png,svg] ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python documentation generator
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinx/archive/v5.3.0.tar.gz -> sphinx-5.3.0.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ab692ca442fde81e96468680392f4d7f
+_md5_=2df9c5f6d03d3f4215568a8c884aac58
diff --git a/metadata/md5-cache/dev-python/sphinx-6.1.3 b/metadata/md5-cache/dev-python/sphinx-6.1.3
index 9debaa2df47e..3c4fcd29a1d0 100644
--- a/metadata/md5-cache/dev-python/sphinx-6.1.3
+++ b/metadata/md5-cache/dev-python/sphinx-6.1.3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( app-text/dvipng dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex virtual/imagemagick-tools[jpeg,png,svg] ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.25.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( app-text/dvipng dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex virtual/imagemagick-tools[jpeg,png,svg] ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.25.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python documentation generator
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc latex test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD-2
-RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.25.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-2.9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.20[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.18[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/imagesize-1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.25.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib-metadata-4.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-doc/sphinx/archive/v6.1.3.tar.gz -> sphinx-6.1.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5248bc575444ac3593fb69741d618f16
+_md5_=446d3c1604a8139f01857d76029882c5
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
deleted file mode 100644
index abfd5e363740..000000000000
--- a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/sphinx-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DESCRIPTION=Celery Sphinx Theme and Utilities
-EAPI=7
-HOMEPAGE=https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/sphinx-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx_celery/sphinx_celery-2.0.0.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5745a5f60c9e169e3119e06f0ef4245c
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2 b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2
index f6460cab3a9c..fa1791966e36 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2
+++ b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/celery/sphinx_celery/ https://pypi.org/project/sphinx-celery/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=dev-python/sphinx-2.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx_celery/sphinx_celery-2.0.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4a72d7f5e11682aa0ef550a894a8afe6
+_md5_=ffd7910d3c50ce0e728a3e7b3f116b11
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0 b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
index faee7be33ac9..a2c98a5fcca1 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/numpydoc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-0.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-docutils-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/numpydoc[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-0.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-docutils-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx extensions for BibTeX style citations
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-0.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-docutils-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/docutils-0.8[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-0.24[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybtex-docutils-1.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c2fffb8fb69cf6592f9e7c5472f4a7a8
+_md5_=1b51a1889c7e5944cad779badb76f476
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.7 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
index e1ef0d2af57e..9a8cd798efea 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
+++ b/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-2.0.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6bbad6122c55ac9f1d3754576854eb47
+_md5_=e312c7a15d3df8cade00d80b94356639
diff --git a/metadata/md5-cache/dev-python/sqlparse-0.4.3 b/metadata/md5-cache/dev-python/sqlparse-0.4.4
similarity index 80%
rename from metadata/md5-cache/dev-python/sqlparse-0.4.3
rename to metadata/md5-cache/dev-python/sqlparse-0.4.4
index a4d4aaa5581a..83afc89579eb 100644
--- a/metadata/md5-cache/dev-python/sqlparse-0.4.3
+++ b/metadata/md5-cache/dev-python/sqlparse-0.4.4
@@ -1,8 +1,8 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A non-validating SQL parser module for Python
 EAPI=8
-HOMEPAGE=https://github.com/andialbrecht/sqlparse
+HOMEPAGE=https://github.com/andialbrecht/sqlparse/ https://pypi.org/project/sqlparse/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
@@ -11,6 +11,6 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlparse/sqlparse-0.4.3.tar.gz
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sqlparse/sqlparse-0.4.4.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c4d472d08166aa1cddc1180c0a4d9dfa
+_md5_=c4c1b663b31425109790fc7f53bbf6b7
diff --git a/metadata/md5-cache/dev-python/tornado-6.2-r1 b/metadata/md5-cache/dev-python/tornado-6.2-r1
index dbf220e3465e..708d16102929 100644
--- a/metadata/md5-cache/dev-python/tornado-6.2-r1
+++ b/metadata/md5-cache/dev-python/tornado-6.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
 INHERIT=distutils-r1 pypi
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=86b7bcd7a7fbf9fc56aa6f9d212fb7b4
+_md5_=268b652bba6e530c8b664d25ec708c80
diff --git a/metadata/md5-cache/dev-python/tornado-6.3 b/metadata/md5-cache/dev-python/tornado-6.3
new file mode 100644
index 000000000000..a7f788091c97
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tornado-6.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python web framework and asynchronous networking library
+EAPI=8
+HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
+INHERIT=distutils-r1 pypi
+IUSE=examples test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.3.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b5122fc5c0f84fddc4bae4a80a366a84
diff --git a/metadata/md5-cache/dev-python/trove-classifiers-2023.4.18 b/metadata/md5-cache/dev-python/trove-classifiers-2023.4.18
new file mode 100644
index 000000000000..aa386183a425
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trove-classifiers-2023.4.18
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/calver[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Canonical source for classifiers on PyPI (pypi.org)
+EAPI=8
+HOMEPAGE=https://github.com/pypa/trove-classifiers/ https://pypi.org/project/trove-classifiers/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/trove-classifiers/trove-classifiers-2023.4.18.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c5be461dde21555048a828229a0125ff
diff --git a/metadata/md5-cache/dev-python/twine-4.0.2 b/metadata/md5-cache/dev-python/twine-4.0.2
index 2b84623f07b5..fcc801667738 100644
--- a/metadata/md5-cache/dev-python/twine-4.0.2
+++ b/metadata/md5-cache/dev-python/twine-4.0.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.8.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/readme_renderer-35.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=dev-python/setuptools-scm[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.8.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/readme_renderer-35.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of utilities for publishing packages on PyPI
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.8.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/readme_renderer-35.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/importlib-metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pkginfo-1.8.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/readme_renderer-35.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-12.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.26.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/4.0.2.tar.gz -> twine-4.0.2.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3afa3254872fed468c42130e0ceefc4e
+_md5_=73c043592825721e61c26b191ef7c966
diff --git a/metadata/md5-cache/dev-python/typeguard-3.0.2 b/metadata/md5-cache/dev-python/typeguard-3.0.2
index 52b9a1dd885a..f8283ce6cbef 100644
--- a/metadata/md5-cache/dev-python/typeguard-3.0.2
+++ b/metadata/md5-cache/dev-python/typeguard-3.0.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools-scm-6.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/setuptools-scm-6.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Run-time type checker for Python
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=python_targets_python3_9? ( >=dev-python/importlib-metadata-3.6[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/typeguard/typeguard-3.0.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4d93229d5db73e1535f89f035df1d943
+_md5_=d83f518693b7d73d66c075fce3aa514e
diff --git a/metadata/md5-cache/dev-python/versioningit-2.2.0 b/metadata/md5-cache/dev-python/versioningit-2.2.0
index f687fa6df8d3..043dc31baf07 100644
--- a/metadata/md5-cache/dev-python/versioningit-2.2.0
+++ b/metadata/md5-cache/dev-python/versioningit-2.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pydantic[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A setuptools plugin for versioning based on git tags
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/packaging-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/packaging-17.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( <dev-python/tomli-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/v/versioningit/versioningit-2.2.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a59d856e248ca55fbe1aeeed252d8305
+_md5_=4c73e85a7930d78591bb3073c9c32bde
diff --git a/metadata/md5-cache/dev-python/wxpython-4.2.0 b/metadata/md5-cache/dev-python/wxpython-4.2.0
index ff110bdbdc4c..8a1514bf4404 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.2.0
+++ b/metadata/md5-cache/dev-python/wxpython-4.2.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.wxpython.org/
 INHERIT=distutils-r1 multiprocessing virtualx wxwidgets pypi
 IUSE=test webkit python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=wxWinLL-3
 RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.2-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test !test? ( test )
 SLOT=4.0
 SRC_URI=https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-4.2.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=9eff3d89ca33b8bf1ef9310122b2a399
+_md5_=eeac5be0f5c0202f96c301e6ea4444d9
diff --git a/metadata/md5-cache/dev-python/xarray-2023.4.1 b/metadata/md5-cache/dev-python/xarray-2023.4.1
new file mode 100644
index 000000000000..61a8bc3d0321
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xarray-2023.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/bottleneck[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/matplotlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/toolz[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( >=dev-python/scipy-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/numpy-1.22[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=N-D labeled arrays and datasets in Python
+EAPI=8
+HOMEPAGE=https://xarray.pydata.org/ https://github.com/pydata/xarray/ https://pypi.org/project/xarray/
+INHERIT=distutils-r1 multiprocessing pypi
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/numpy-1.22[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/x/xarray/xarray-2023.4.1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8ad1b738f9a1b7aa923d946bd44e43ba
diff --git a/metadata/md5-cache/dev-python/yapf-0.33.0 b/metadata/md5-cache/dev-python/yapf-0.33.0
new file mode 100644
index 000000000000..ca03d92119db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/yapf-0.33.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A formatter for Python files
+EAPI=8
+HOMEPAGE=https://github.com/google/yapf/ https://pypi.org/project/yapf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/yapf/archive/v0.33.0.tar.gz -> yapf-0.33.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3ac79cfca9c613fa2759b428f4ac272b
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.0.1 b/metadata/md5-cache/dev-python/ytmusicapi-1.0.1
new file mode 100644
index 000000000000..e4f175d031ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Unofficial API for YouTube Music
+EAPI=8
+HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.0.1.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=eb5bee540e093608539e8e256631930a
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ddb33ba7ba07..1c3d250377cb 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1 b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
index 75fed7bde66d..69ce42aecfad 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
 EAPI=8
 HOMEPAGE=https://coolio.github.io/
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cool.io-1.7.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a8c00efa9c5b2d6f22e2c71b3e5eeace
+_md5_=0dc1b5847f1d7b6f09669d9ad79d1d99
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0-r1
new file mode 100644
index 000000000000..efc74a3a47a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-1.1.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A Ruby wrapper for the MRI 2.0 debug_inspector API
+EAPI=8
+HOMEPAGE=https://github.com/banister/debug_inspector
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/banister/debug_inspector/archive/v1.1.0.tar.gz -> debug_inspector-1.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4a0f06ad82e2d052458142f7c9e48172
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.6.1 b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
index c1428786b817..aa1e447d6e12 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.6.1
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.6.1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Native Ruby bindings to itex2MML, which converts itex equations to MathML
 EAPI=8
 HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/itextomml-1.6.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=102e3db660d03ae02b07b715649051be
+_md5_=c1943ebe9c6e540846e4b8aca4c4fa35
diff --git a/metadata/md5-cache/dev-ruby/parallel-1.23.0 b/metadata/md5-cache/dev-ruby/parallel-1.23.0
new file mode 100644
index 000000000000..d937aff176fa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parallel-1.23.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/ruby-progressbar[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/activerecord[ruby_targets_ruby30(-),sqlite] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/activerecord[ruby_targets_ruby31(-),sqlite] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( sys-process/lsof sys-process/procps ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Run any code in parallel Processes or Threads
+EAPI=8
+HOMEPAGE=https://github.com/grosser/parallel
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/grosser/parallel/archive/v1.23.0.tar.gz -> parallel-1.23.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d3d225ce5d5bfb89ef78cdf72ddf0795
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2 b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
new file mode 100644
index 000000000000..d0e57c87ec24
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A Ruby interface to termios
+EAPI=8
+HOMEPAGE=http://arika.org/ruby/termios
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+LICENSE=Ruby-BSD
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/ruby-termios-1.1.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6e9ffa9a60e952d390d67a652c733a58
diff --git a/metadata/md5-cache/dev-ruby/sanitize-6.0.1 b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
index 1f219eb38738..82f96fc705eb 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-6.0.1
+++ b/metadata/md5-cache/dev-ruby/sanitize-6.0.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby32(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/minitest[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Sanitize is a whitelist-based HTML sanitizer
 EAPI=8
 HOMEPAGE=https://github.com/rgrove/sanitize
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby27(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby30(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby31(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby32(-)] =dev-ruby/crass-1.0*[ruby_targets_ruby32(-)] >=dev-ruby/nokogiri-1.12.0[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://github.com/rgrove/sanitize/archive/v6.0.1.tar.gz -> sanitize-6.0.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5879fd2d0028af5069d07cd0900be7d3
+_md5_=e5beb4aad00038829194d07a444e3175
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 1bde15686653..7ea94b385b6c 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
index b5958dc121d4..6d4b88573950 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.speech.kth.se/snack/
 INHERIT=distutils-r1 flag-o-matic toolchain-funcs virtualx
 IUSE=alsa examples python vorbis python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5
-_md5_=427bb4ad24047209d64a158472d3af90
+_md5_=41a6a8c821fc950c597555661502410d
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2 b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
index 8e8a26736f8c..4e8cdc50b826 100644
--- a/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
+++ b/metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=http://jfontain.free.fr/tclpython.htm
 INHERIT=python-single-r1 toolchain-funcs
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-lang/tcl:0=
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/amykyta3/tclpython/archive/5.0.tar.gz -> tclpython-5.0.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=367b5d045c61eac279a2bf3ee9ca27c1
+_md5_=96260444ea837d57080a2d00ef5d826f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 13489c5afef6..6a3c95d49c59 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/ROPgadget-7.3 b/metadata/md5-cache/dev-util/ROPgadget-7.3
index ece7c870b0d2..26cec1f2e535 100644
--- a/metadata/md5-cache/dev-util/ROPgadget-7.3
+++ b/metadata/md5-cache/dev-util/ROPgadget-7.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://shell-storm.org/project/ROPgadget/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] ) >=dev-libs/capstone-5[python,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/JonathanSalwan/ROPgadget/archive/v7.3.tar.gz -> ROPgadget-7.3.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e827dca81d5a28fe070fa9488d9315b9
+_md5_=467d002e833a1486af8229a7544c8825
diff --git a/metadata/md5-cache/dev-util/android-tools-34.0.0 b/metadata/md5-cache/dev-util/android-tools-34.0.0
index a6dd753685a9..32adccc35c56 100644
--- a/metadata/md5-cache/dev-util/android-tools-34.0.0
+++ b/metadata/md5-cache/dev-util/android-tools-34.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/nmeum/android-tools/ https://developer.android.com/
 INHERIT=cmake python-r1
 IUSE=python udev python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0 BSD-2
 RDEPEND=app-arch/brotli:= app-arch/lz4:= app-arch/zstd:= dev-libs/libpcre2:= >=dev-libs/protobuf-3.0.0:= sys-libs/zlib:= virtual/libusb:1= udev? ( dev-util/android-udev-rules ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/nmeum/android-tools/releases/download/34.0.0/android-tools-34.0.0.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-31.0.3-no-gtest.patch
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f30ed2c5bbc8b5e9815619ad89486030
+_md5_=537b2ff0714a60157bf4e391b1644f47
diff --git a/metadata/md5-cache/dev-util/cproto-4.7v b/metadata/md5-cache/dev-util/cproto-4.7v
index 1d2776932df2..52f31772ba23 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7v
+++ b/metadata/md5-cache/dev-util/cproto-4.7v
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/cproto/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7v.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7v.tgz.asc )
 _eclasses_=verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=416973bc368ac310142d71f38794c6e8
+_md5_=1e2d936148be0211884de40abddfe6d3
diff --git a/metadata/md5-cache/dev-util/diffuse-0.7.7 b/metadata/md5-cache/dev-util/diffuse-0.7.7
index 372fdaff28f2..4d309a99592b 100644
--- a/metadata/md5-cache/dev-util/diffuse-0.7.7
+++ b/metadata/md5-cache/dev-util/diffuse-0.7.7
@@ -7,11 +7,11 @@ HOMEPAGE=http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson plocale python-r1 xdg
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_targets_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) python_targets_python3_10? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) python_targets_python3_11? ( dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,cairo] ) x11-libs/gtk+:3[introspection]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/MightyCreak/diffuse/archive/v0.7.7.tar.gz -> diffuse-0.7.7.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b917bf841b382ed81b59bc9a0ab99d98
+_md5_=abf3af322cfcd985e246e1bac0943e24
diff --git a/metadata/md5-cache/dev-util/fq-0.4.0 b/metadata/md5-cache/dev-util/fq-0.4.0
index 5cb5b1dd64c0..de8fe4aac01a 100644
--- a/metadata/md5-cache/dev-util/fq-0.4.0
+++ b/metadata/md5-cache/dev-util/fq-0.4.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/wader/fq
 INHERIT=go-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=MIT BSD-2
 RESTRICT=!test? ( test ) strip
 SLOT=0
 SRC_URI=https://github.com/wader/fq/archive/v0.4.0.tar.gz -> fq-0.4.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-util/fq/fq-0.4.0-deps.tar.xz
 _eclasses_=go-module	9c75e51a48520b2f01471c1f91762882	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c6020108d890b7dd8dd694cbce1e9ade
+_md5_=4040ce086dd80603cd1f88c8681b26e6
diff --git a/metadata/md5-cache/dev-util/gn-0.2088 b/metadata/md5-cache/dev-util/gn-0.2088
new file mode 100644
index 000000000000..ddadd1487ce8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gn-0.2088
@@ -0,0 +1,12 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-util/ninja
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=GN is a meta-build system that generates build files for Ninja
+EAPI=8
+HOMEPAGE=https://gn.googlesource.com/
+INHERIT=ninja-utils python-any-r1 toolchain-funcs
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/gn-0.2088.tar.xz
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=3c8c4bb65f82b83355e222f79b2daf73
diff --git a/metadata/md5-cache/dev-util/ignition-cmake-2.14.0 b/metadata/md5-cache/dev-util/ignition-cmake-2.16.0
similarity index 91%
rename from metadata/md5-cache/dev-util/ignition-cmake-2.14.0
rename to metadata/md5-cache/dev-util/ignition-cmake-2.16.0
index fadf6981ce71..351ce2daaa8f 100644
--- a/metadata/md5-cache/dev-util/ignition-cmake-2.14.0
+++ b/metadata/md5-cache/dev-util/ignition-cmake-2.16.0
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=2
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake2-2.14.0.tar.bz2
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake2-2.16.0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d784cc6df98c701d0edd5f5bd9bad3eb
+_md5_=f1dcc9e7d308bd902f191bc483122655
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13822.1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13822.1
new file mode 100644
index 000000000000..813272a677aa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13822.1
@@ -0,0 +1,15 @@
+BDEPEND==sys-devel/lld-14* || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/opencl-clang:14= dev-util/spirv-tools sys-devel/lld:14= sys-devel/llvm:14= vc? ( >=dev-libs/intel-vc-intrinsics-0.11.0 dev-util/spirv-llvm-translator:14= ) !!sys-devel/llvm:0
+DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
+EAPI=8
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+INHERIT=cmake flag-o-matic llvm python-any-r1
+IUSE=debug vc
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/opencl-clang:14= dev-util/spirv-tools sys-devel/lld:14= sys-devel/llvm:14= vc? ( >=dev-libs/intel-vc-intrinsics-0.11.0 dev-util/spirv-llvm-translator:14= )
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.13822.1.tar.gz -> intel-graphics-compiler-1.0.13822.1.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=618ec381f2544b7643e058c407955136
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index d8c9ac5c067d..bfd251d87806 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c440bf0d29c528bd4a549fe2bac1c1fa
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index e581bd630509..d05697ddfc87 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6f8c56176a914b9a0329aa2acd261b13
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.1 b/metadata/md5-cache/dev-util/lldb-16.0.1
index 840dac4ce3a2..5681a4cb5e50 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.1
+++ b/metadata/md5-cache/dev-util/lldb-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90254b661bcbc72db1b72b17f80eefd8
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.2 b/metadata/md5-cache/dev-util/lldb-16.0.2
new file mode 100644
index 000000000000..91e1622210c4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-16.0.2[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.2[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.2[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.2 ~sys-devel/llvm-16.0.2 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.2 ~sys-devel/llvm-16.0.2 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=90254b661bcbc72db1b72b17f80eefd8
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.2.9999 b/metadata/md5-cache/dev-util/lldb-16.0.3.9999
similarity index 85%
rename from metadata/md5-cache/dev-util/lldb-16.0.2.9999
rename to metadata/md5-cache/dev-util/lldb-16.0.3.9999
index 72ebf8122821..3293ca198483 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.2.9999
+++ b/metadata/md5-cache/dev-util/lldb-16.0.3.9999
@@ -1,6 +1,6 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-16.0.2.9999[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.2.9999[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.2.9999[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_9? ( ~dev-python/lit-16.0.3.9999[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-16.0.3.9999[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-16.0.3.9999[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.2.9999 ~sys-devel/llvm-16.0.2.9999 !!sys-devel/llvm:0
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.3.9999 ~sys-devel/llvm-16.0.3.9999 !!sys-devel/llvm:0
 DESCRIPTION=The LLVM debugger
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -8,9 +8,9 @@ INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.2.9999 ~sys-devel/llvm-16.0.2.9999 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-16.0.3.9999 ~sys-devel/llvm-16.0.3.9999 python? ( python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0.9999 b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
index ef587edb3610..9aad9c29dfbb 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325
index 76619df7e2c3..5689e3356d3d 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414
index 71cef0f8f8d3..4ed2447dcb63 100644
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414
+++ b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=test !test? ( test )
 SLOT=0/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8a35893597acd1da724999a7c2d9c010
diff --git a/metadata/md5-cache/dev-util/maturin-0.14.16 b/metadata/md5-cache/dev-util/maturin-0.14.16
deleted file mode 100644
index 21c3e5fc9353..000000000000
--- a/metadata/md5-cache/dev-util/maturin-0.14.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/boltons[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
-EAPI=8
-HOMEPAGE=https://www.maturin.rs/
-INHERIT=cargo distutils-r1 flag-o-matic
-IUSE=doc test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl doc? ( CC-BY-4.0 OFL-1.1 )
-RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.14.16.tar.gz -> maturin-0.14.16.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/async-io/1.12.0/download -> async-io-1.12.0.crate https://crates.io/api/v1/crates/async-lock/2.7.0/download -> async-lock-2.7.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/1.2.0/download -> bstr-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/camino/1.1.3/download -> camino-1.1.3.crate https://crates.io/api/v1/crates/cargo-options/0.5.3/download -> cargo-options-0.5.3.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.13.3/download -> cargo-xwin-0.13.3.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.14.3/download -> cargo-zigbuild-0.14.3.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.0.2/download -> clap_complete_fig-4.0.2.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/concolor/0.0.11/download -> concolor-0.0.11.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/concurrent-queue/2.1.0/download -> concurrent-queue-2.1.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/const-random/0.1.15/download -> const-random-0.1.15.crate https://crates.io/api/v1/crates/const-random-macro/0.1.15/download -> const-random-macro-0.1.15.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.14/download -> crossbeam-epoch-0.9.14.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.15/download -> crossbeam-utils-0.8.15.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.3/download -> dialoguer-0.10.3.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/futures/0.3.26/download -> futures-0.3.26.crate https://crates.io/api/v1/crates/futures-channel/0.3.26/download -> futures-channel-0.3.26.crate https://crates.io/api/v1/crates/futures-core/0.3.26/download -> futures-core-0.3.26.crate https://crates.io/api/v1/crates/futures-executor/0.3.26/download -> futures-executor-0.3.26.crate https://crates.io/api/v1/crates/futures-io/0.3.26/download -> futures-io-0.3.26.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.26/download -> futures-macro-0.3.26.crate https://crates.io/api/v1/crates/futures-sink/0.3.26/download -> futures-sink-0.3.26.crate https://crates.io/api/v1/crates/futures-task/0.3.26/download -> futures-task-0.3.26.crate https://crates.io/api/v1/crates/futures-util/0.3.26/download -> futures-util-0.3.26.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/goblin/0.6.1/download -> goblin-0.6.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hkdf/0.11.0/download -> hkdf-0.11.0.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indicatif/0.17.3/download -> indicatif-0.17.3.crate https://crates.io/api/v1/crates/indoc/2.0.0/download -> indoc-2.0.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/keyring/1.2.1/download -> keyring-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.30.5/download -> minijinja-0.30.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/msi/0.5.1/download -> msi-0.5.1.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/nom8/0.2.0/download -> nom8-0.2.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.0.1/download -> normpath-1.0.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.3/download -> num-complex-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.0+1.1.1t/download -> openssl-src-111.25.0+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.6/download -> parking_lot_core-0.9.6.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.2/download -> platform-info-1.0.2.crate https://crates.io/api/v1/crates/polling/2.5.2/download -> polling-2.5.2.crate https://crates.io/api/v1/crates/portable-atomic/0.3.19/download -> portable-atomic-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/quoted_printable/0.4.7/download -> quoted_printable-0.4.7.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.1/download -> rfc2047-decoder-0.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/7.2.0/download -> rpassword-7.2.0.crate https://crates.io/api/v1/crates/rtoolbox/0.0.1/download -> rtoolbox-0.0.1.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.2/download -> secret-service-2.0.2.crate https://crates.io/api/v1/crates/security-framework/2.8.2/download -> security-framework-2.8.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.8.0/download -> security-framework-sys-2.8.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_repr/0.1.10/download -> serde_repr-0.1.10.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.4/download -> snapbox-0.4.4.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.4.0/download -> tempfile-3.4.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml_datetime/0.5.0/download -> toml_datetime-0.5.0.crate https://crates.io/api/v1/crates/toml_edit/0.17.1/download -> toml_edit-0.17.1.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/trycmd/0.14.10/download -> trycmd-0.14.10.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/uniffi_bindgen/0.22.0/download -> uniffi_bindgen-0.22.0.crate https://crates.io/api/v1/crates/uniffi_checksum_derive/0.22.0/download -> uniffi_checksum_derive-0.22.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.22.0/download -> uniffi_meta-0.22.0.crate https://crates.io/api/v1/crates/uniffi_testing/0.22.0/download -> uniffi_testing-0.22.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.10/download -> xwin-0.2.10.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zbus/1.9.3/download -> zbus-1.9.3.crate https://crates.io/api/v1/crates/zbus_macros/1.9.3/download -> zbus_macros-1.9.3.crate https://crates.io/api/v1/crates/zip/0.6.4/download -> zip-0.6.4.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/anyhow/1.0.66/download -> anyhow-1.0.66.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/camino/1.1.1/download -> camino-1.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.2/download -> cargo_metadata-0.15.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/paste/1.0.10/download -> paste-1.0.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.151/download -> serde-1.0.151.crate https://crates.io/api/v1/crates/serde_derive/1.0.151/download -> serde_derive-1.0.151.crate https://crates.io/api/v1/crates/serde_json/1.0.89/download -> serde_json-1.0.89.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/syn/1.0.105/download -> syn-1.0.105.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/uniffi/0.22.0/download -> uniffi-0.22.0.crate https://crates.io/api/v1/crates/uniffi_build/0.22.0/download -> uniffi_build-0.22.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.22.0/download -> uniffi_macros-0.22.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate )
-_eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c2c91ff8651f9ffba77ac7c3d80a4522
diff --git a/metadata/md5-cache/dev-util/maturin-0.14.17 b/metadata/md5-cache/dev-util/maturin-0.14.17
index c08fee3d96ba..851381d8cd68 100644
--- a/metadata/md5-cache/dev-util/maturin-0.14.17
+++ b/metadata/md5-cache/dev-util/maturin-0.14.17
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.maturin.rs/
 INHERIT=cargo distutils-r1 flag-o-matic
 IUSE=doc test debug python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 SSLeay Unicode-DFS-2016 openssl doc? ( CC-BY-4.0 OFL-1.1 )
 RDEPEND=python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyO3/maturin/archive/refs/tags/v0.14.17.tar.gz -> maturin-0.14.17.gh.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/anyhow/1.0.69/download -> anyhow-1.0.69.crate https://crates.io/api/v1/crates/askama/0.11.1/download -> askama-0.11.1.crate https://crates.io/api/v1/crates/askama_derive/0.11.2/download -> askama_derive-0.11.2.crate https://crates.io/api/v1/crates/askama_escape/0.10.3/download -> askama_escape-0.10.3.crate https://crates.io/api/v1/crates/askama_shared/0.12.2/download -> askama_shared-0.12.2.crate https://crates.io/api/v1/crates/async-io/1.12.0/download -> async-io-1.12.0.crate https://crates.io/api/v1/crates/async-lock/2.7.0/download -> async-lock-2.7.0.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.8.1/download -> block-modes-0.8.1.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/1.2.0/download -> bstr-1.2.0.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.4.0/download -> bytes-1.4.0.crate https://crates.io/api/v1/crates/bytesize/1.2.0/download -> bytesize-1.2.0.crate https://crates.io/api/v1/crates/bzip2/0.4.4/download -> bzip2-0.4.4.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.1/download -> cab-0.4.1.crate https://crates.io/api/v1/crates/camino/1.1.3/download -> camino-1.1.3.crate https://crates.io/api/v1/crates/cargo-options/0.5.3/download -> cargo-options-0.5.3.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.13.3/download -> cargo-xwin-0.13.3.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.14.3/download -> cargo-zigbuild-0.14.3.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.3/download -> cargo_metadata-0.15.3.crate https://crates.io/api/v1/crates/cbindgen/0.24.3/download -> cbindgen-0.24.3.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfb/0.7.3/download -> cfb-0.7.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chumsky/0.8.0/download -> chumsky-0.8.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/4.0.32/download -> clap-4.0.32.crate https://crates.io/api/v1/crates/clap_complete/4.0.7/download -> clap_complete-4.0.7.crate https://crates.io/api/v1/crates/clap_complete_command/0.4.0/download -> clap_complete_command-0.4.0.crate https://crates.io/api/v1/crates/clap_complete_fig/4.0.2/download -> clap_complete_fig-4.0.2.crate https://crates.io/api/v1/crates/clap_derive/4.0.21/download -> clap_derive-4.0.21.crate https://crates.io/api/v1/crates/clap_lex/0.3.0/download -> clap_lex-0.3.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/concolor/0.0.11/download -> concolor-0.0.11.crate https://crates.io/api/v1/crates/concolor-query/0.1.0/download -> concolor-query-0.1.0.crate https://crates.io/api/v1/crates/concurrent-queue/2.1.0/download -> concurrent-queue-2.1.0.crate https://crates.io/api/v1/crates/configparser/3.0.2/download -> configparser-3.0.2.crate https://crates.io/api/v1/crates/console/0.15.5/download -> console-0.15.5.crate https://crates.io/api/v1/crates/const-random/0.1.15/download -> const-random-0.1.15.crate https://crates.io/api/v1/crates/const-random-macro/0.1.15/download -> const-random-macro-0.1.15.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.5/download -> cpufeatures-0.2.5.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.3/download -> crossbeam-deque-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.14/download -> crossbeam-epoch-0.9.14.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.15/download -> crossbeam-utils-0.8.15.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/crypto-mac/0.11.1/download -> crypto-mac-0.11.1.crate https://crates.io/api/v1/crates/ctor/0.1.26/download -> ctor-0.1.26.crate https://crates.io/api/v1/crates/data-encoding/2.3.3/download -> data-encoding-2.3.3.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.3/download -> dialoguer-0.10.3.crate https://crates.io/api/v1/crates/diff/0.1.13/download -> diff-0.1.13.crate https://crates.io/api/v1/crates/digest/0.10.6/download -> digest-0.10.6.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.3/download -> dunce-1.0.3.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.32/download -> encoding_rs-0.8.32.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.3/download -> event-listener-2.5.3.crate https://crates.io/api/v1/crates/fastrand/1.9.0/download -> fastrand-1.9.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.6/download -> fat-macho-0.4.6.crate https://crates.io/api/v1/crates/filetime/0.2.19/download -> filetime-0.2.19.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs-err/2.9.0/download -> fs-err-2.9.0.crate https://crates.io/api/v1/crates/futures/0.3.26/download -> futures-0.3.26.crate https://crates.io/api/v1/crates/futures-channel/0.3.26/download -> futures-channel-0.3.26.crate https://crates.io/api/v1/crates/futures-core/0.3.26/download -> futures-core-0.3.26.crate https://crates.io/api/v1/crates/futures-executor/0.3.26/download -> futures-executor-0.3.26.crate https://crates.io/api/v1/crates/futures-io/0.3.26/download -> futures-io-0.3.26.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.26/download -> futures-macro-0.3.26.crate https://crates.io/api/v1/crates/futures-sink/0.3.26/download -> futures-sink-0.3.26.crate https://crates.io/api/v1/crates/futures-task/0.3.26/download -> futures-task-0.3.26.crate https://crates.io/api/v1/crates/futures-util/0.3.26/download -> futures-util-0.3.26.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/globset/0.4.10/download -> globset-0.4.10.crate https://crates.io/api/v1/crates/goblin/0.6.1/download -> goblin-0.6.1.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heck/0.4.1/download -> heck-0.4.1.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hkdf/0.11.0/download -> hkdf-0.11.0.crate https://crates.io/api/v1/crates/hmac/0.11.0/download -> hmac-0.11.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/indicatif/0.17.3/download -> indicatif-0.17.3.crate https://crates.io/api/v1/crates/indoc/2.0.0/download -> indoc-2.0.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.2/download -> is-terminal-0.4.2.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.5/download -> itoa-1.0.5.crate https://crates.io/api/v1/crates/js-sys/0.3.61/download -> js-sys-0.3.61.crate https://crates.io/api/v1/crates/keyring/1.2.1/download -> keyring-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.3.2/download -> lddtree-0.3.2.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/memoffset/0.8.0/download -> memoffset-0.8.0.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.30.5/download -> minijinja-0.30.5.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/msi/0.5.1/download -> msi-0.5.1.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.11/download -> native-tls-0.2.11.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/nom8/0.2.0/download -> nom8-0.2.0.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/normpath/1.0.1/download -> normpath-1.0.1.crate https://crates.io/api/v1/crates/nu-ansi-term/0.46.0/download -> nu-ansi-term-0.46.0.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.4.3/download -> num-complex-0.4.3.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.4.1/download -> num-rational-0.4.1.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/once_cell/1.17.1/download -> once_cell-1.17.1.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.45/download -> openssl-0.10.45.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.25.0+1.1.1t/download -> openssl-src-111.25.0+1.1.1t.crate https://crates.io/api/v1/crates/openssl-sys/0.9.80/download -> openssl-sys-0.9.80.crate https://crates.io/api/v1/crates/os_pipe/1.1.2/download -> os_pipe-1.1.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.6/download -> parking_lot_core-0.9.6.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/path-slash/0.2.1/download -> path-slash-0.2.1.crate https://crates.io/api/v1/crates/pep440/0.2.0/download -> pep440-0.2.0.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.26/download -> pkg-config-0.3.26.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/1.0.2/download -> platform-info-1.0.2.crate https://crates.io/api/v1/crates/polling/2.5.2/download -> polling-2.5.2.crate https://crates.io/api/v1/crates/portable-atomic/0.3.19/download -> portable-atomic-0.3.19.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/pretty_assertions/1.3.0/download -> pretty_assertions-1.3.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.2.1/download -> proc-macro-crate-1.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.20+deprecated/download -> proc-macro-hack-0.5.20+deprecated.crate https://crates.io/api/v1/crates/proc-macro2/1.0.51/download -> proc-macro2-1.0.51.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.5/download -> python-pkginfo-0.5.5.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/quoted_printable/0.4.7/download -> quoted_printable-0.4.7.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.2.1/download -> rfc2047-decoder-0.2.1.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/7.2.0/download -> rpassword-7.2.0.crate https://crates.io/api/v1/crates/rtoolbox/0.0.1/download -> rtoolbox-0.0.1.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/rustversion/1.0.11/download -> rustversion-1.0.11.crate https://crates.io/api/v1/crates/ryu/1.0.12/download -> ryu-1.0.12.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.21/download -> schannel-0.1.21.crate https://crates.io/api/v1/crates/scoped-tls/1.0.1/download -> scoped-tls-1.0.1.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.2/download -> secret-service-2.0.2.crate https://crates.io/api/v1/crates/security-framework/2.8.2/download -> security-framework-2.8.2.crate https://crates.io/api/v1/crates/security-framework-sys/2.8.0/download -> security-framework-sys-2.8.0.crate https://crates.io/api/v1/crates/semver/1.0.16/download -> semver-1.0.16.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.93/download -> serde_json-1.0.93.crate https://crates.io/api/v1/crates/serde_repr/0.1.10/download -> serde_repr-0.1.10.crate https://crates.io/api/v1/crates/sha2/0.10.6/download -> sha2-0.10.6.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.8/download -> slab-0.4.8.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snapbox/0.4.4/download -> snapbox-0.4.4.crate https://crates.io/api/v1/crates/snapbox-macros/0.3.1/download -> snapbox-macros-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.7/download -> socket2-0.4.7.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.109/download -> syn-1.0.109.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.6/download -> target-lexicon-0.12.6.crate https://crates.io/api/v1/crates/tempfile/3.4.0/download -> tempfile-3.4.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/terminal_size/0.2.3/download -> terminal_size-0.2.3.crate https://crates.io/api/v1/crates/textwrap/0.16.0/download -> textwrap-0.16.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.17/download -> time-0.3.17.crate https://crates.io/api/v1/crates/time-core/0.1.0/download -> time-core-0.1.0.crate https://crates.io/api/v1/crates/time-macros/0.2.6/download -> time-macros-0.2.6.crate https://crates.io/api/v1/crates/tiny-keccak/2.0.2/download -> tiny-keccak-2.0.2.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.11/download -> toml-0.5.11.crate https://crates.io/api/v1/crates/toml_datetime/0.5.0/download -> toml_datetime-0.5.0.crate https://crates.io/api/v1/crates/toml_edit/0.17.1/download -> toml_edit-0.17.1.crate https://crates.io/api/v1/crates/tracing/0.1.37/download -> tracing-0.1.37.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.23/download -> tracing-attributes-0.1.23.crate https://crates.io/api/v1/crates/tracing-core/0.1.30/download -> tracing-core-0.1.30.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.16/download -> tracing-subscriber-0.3.16.crate https://crates.io/api/v1/crates/trycmd/0.14.10/download -> trycmd-0.14.10.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.16.0/download -> typenum-1.16.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.4/download -> unicode-linebreak-0.1.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/uniffi_bindgen/0.22.0/download -> uniffi_bindgen-0.22.0.crate https://crates.io/api/v1/crates/uniffi_checksum_derive/0.22.0/download -> uniffi_checksum_derive-0.22.0.crate https://crates.io/api/v1/crates/uniffi_meta/0.22.0/download -> uniffi_meta-0.22.0.crate https://crates.io/api/v1/crates/uniffi_testing/0.22.0/download -> uniffi_testing-0.22.0.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/uuid/1.3.0/download -> uuid-1.3.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/versions/4.1.0/download -> versions-4.1.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.84/download -> wasm-bindgen-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.84/download -> wasm-bindgen-backend-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.84/download -> wasm-bindgen-macro-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.84/download -> wasm-bindgen-macro-support-0.2.84.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.84/download -> wasm-bindgen-shared-0.2.84.crate https://crates.io/api/v1/crates/web-sys/0.3.61/download -> web-sys-0.3.61.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/weedle2/4.0.0/download -> weedle2-4.0.0.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.10/download -> xwin-0.2.10.crate https://crates.io/api/v1/crates/yansi/0.5.1/download -> yansi-0.5.1.crate https://crates.io/api/v1/crates/zbus/1.9.3/download -> zbus-1.9.3.crate https://crates.io/api/v1/crates/zbus_macros/1.9.3/download -> zbus_macros-1.9.3.crate https://crates.io/api/v1/crates/zip/0.6.4/download -> zip-0.6.4.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/anyhow/1.0.66/download -> anyhow-1.0.66.crate https://crates.io/api/v1/crates/bytes/1.3.0/download -> bytes-1.3.0.crate https://crates.io/api/v1/crates/camino/1.1.1/download -> camino-1.1.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.15.2/download -> cargo_metadata-0.15.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cc/1.0.74/download -> cc-1.0.74.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.6.0/download -> goblin-0.6.0.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/libc/0.2.134/download -> libc-0.2.134.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.16.0/download -> once_cell-1.16.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/paste/1.0.10/download -> paste-1.0.10.crate https://crates.io/api/v1/crates/proc-macro2/1.0.46/download -> proc-macro2-1.0.46.crate https://crates.io/api/v1/crates/proc-macro2/1.0.47/download -> proc-macro2-1.0.47.crate https://crates.io/api/v1/crates/pyo3/0.18.1/download -> pyo3-0.18.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.18.1/download -> pyo3-build-config-0.18.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.18.1/download -> pyo3-ffi-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.18.1/download -> pyo3-macros-0.18.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.18.1/download -> pyo3-macros-backend-0.18.1.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.6/download -> python3-dll-a-0.2.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/semver/1.0.14/download -> semver-1.0.14.crate https://crates.io/api/v1/crates/serde/1.0.151/download -> serde-1.0.151.crate https://crates.io/api/v1/crates/serde_derive/1.0.151/download -> serde_derive-1.0.151.crate https://crates.io/api/v1/crates/serde_json/1.0.89/download -> serde_json-1.0.89.crate https://crates.io/api/v1/crates/syn/1.0.102/download -> syn-1.0.102.crate https://crates.io/api/v1/crates/syn/1.0.103/download -> syn-1.0.103.crate https://crates.io/api/v1/crates/syn/1.0.105/download -> syn-1.0.105.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/uniffi/0.22.0/download -> uniffi-0.22.0.crate https://crates.io/api/v1/crates/uniffi_build/0.22.0/download -> uniffi_build-0.22.0.crate https://crates.io/api/v1/crates/uniffi_macros/0.22.0/download -> uniffi_macros-0.22.0.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.0/download -> windows_aarch64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.0/download -> windows_aarch64_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.0/download -> windows_i686_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.0/download -> windows_i686_msvc-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.0/download -> windows_x86_64_gnu-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.0/download -> windows_x86_64_gnullvm-0.42.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.0/download -> windows_x86_64_msvc-0.42.0.crate )
 _eclasses_=cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0b99f6a0eacd8490f24049b71cecaa3e
+_md5_=c2c91ff8651f9ffba77ac7c3d80a4522
diff --git a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p3 b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p3
new file mode 100644
index 000000000000..1c47181953ec
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare pretend
+DEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv
+DESCRIPTION=All-in-one mingw64 toolchain intended for building Wine without crossdev
+EAPI=8
+HOMEPAGE=https://www.mingw-w64.org/ https://gcc.gnu.org/ https://sourceware.org/binutils/
+INHERIT=edo flag-o-matic multilib-build toolchain-funcs
+IUSE=+abi_x86_32 custom-cflags debug abi_x86_32 abi_x86_64
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
+RDEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v10.0.0.tar.bz2 mirror://gnu/binutils/binutils-2.40.tar.xz mirror://gcc/snapshots/13-20230416/gcc-13-20230416.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=060c491bcad659fbe3be7286418282b7
diff --git a/metadata/md5-cache/dev-util/pwndbg-20230319 b/metadata/md5-cache/dev-util/pwndbg-20230319
index 349ceb34fd1d..7ea3a9e23e26 100644
--- a/metadata/md5-cache/dev-util/pwndbg-20230319
+++ b/metadata/md5-cache/dev-util/pwndbg-20230319
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://github.com/pwndbg/pwndbg
 INHERIT=python-single-r1 wrapper
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sys-devel/gdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] python_single_target_python3_9? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_9(-)] >=dev-python/psutil-5.9.4[python_targets_python3_9(-)] >=dev-python/pycparser-2.21[python_targets_python3_9(-)] >=dev-python/pyelftools-0.29[python_targets_python3_9(-)] >=dev-python/pygments-2.13.0[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.10[python_targets_python3_9(-)] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)] >=dev-util/pwntools-4.9.0[python_targets_python3_9(-)] >=dev-util/ROPgadget-7.2[python_targets_python3_9(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_10(-)] >=dev-python/psutil-5.9.4[python_targets_python3_10(-)] >=dev-python/pycparser-2.21[python_targets_python3_10(-)] >=dev-python/pyelftools-0.29[python_targets_python3_10(-)] >=dev-python/pygments-2.13.0[python_targets_python3_10(-)] >=dev-python/tabulate-0.8.10[python_targets_python3_10(-)] >=dev-python/typing-extensions-4.3.0[python_targets_python3_10(-)] >=dev-util/pwntools-4.9.0[python_targets_python3_10(-)] >=dev-util/ROPgadget-7.2[python_targets_python3_10(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-libs/capstone-4.0.2[python,python_targets_python3_11(-)] >=dev-python/psutil-5.9.4[python_targets_python3_11(-)] >=dev-python/pycparser-2.21[python_targets_python3_11(-)] >=dev-python/pyelftools-0.29[python_targets_python3_11(-)] >=dev-python/pygments-2.13.0[python_targets_python3_11(-)] >=dev-python/tabulate-0.8.10[python_targets_python3_11(-)] >=dev-python/typing-extensions-4.3.0[python_targets_python3_11(-)] >=dev-util/pwntools-4.9.0[python_targets_python3_11(-)] >=dev-util/ROPgadget-7.2[python_targets_python3_11(-)] >=dev-util/unicorn-2.0.1[python,python_targets_python3_11(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/pwndbg/pwndbg/archive/2023.03.19.tar.gz -> pwndbg-20230319.tar.gz https://github.com/martinradev/gdb-pt-dump/archive/ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz -> gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5ed6968cac17e8e6caff265b767bd8de
+_md5_=c39905940c8e5544b318780740add9ba
diff --git a/metadata/md5-cache/dev-util/rbtools-4.0-r1 b/metadata/md5-cache/dev-util/rbtools-4.0-r1
index b677406365df..a92d8d45b815 100644
--- a/metadata/md5-cache/dev-util/rbtools-4.0-r1
+++ b/metadata/md5-cache/dev-util/rbtools-4.0-r1
@@ -1,6 +1,6 @@
-BDEPEND=test? ( >=dev-python/importlib_metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( >=dev-python/importlib-metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/importlib_metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/kgb-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-env[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git dev-vcs/mercurial )
+DEPEND=>=dev-python/importlib-metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/kgb-6.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-env[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git dev-vcs/mercurial )
 DESCRIPTION=Command line tools for use with Review Board
 EAPI=8
 HOMEPAGE=https://www.reviewboard.org/
@@ -8,10 +8,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/importlib_metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+RDEPEND=>=dev-python/importlib-metadata-4.12[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydiffx-1.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/pydiffx-1.1*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/six-1.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/texttable[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.3.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tqdm[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/4.0/RBTools-4.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9c377419c67b9bdf89fab5f2b4f98342
+_md5_=87ecbdc98e8f35dad5f8d192815587b6
diff --git a/metadata/md5-cache/dev-util/rizin-0.5.1 b/metadata/md5-cache/dev-util/rizin-0.5.1
index 78e32da8db3a..78a32a933f41 100644
--- a/metadata/md5-cache/dev-util/rizin-0.5.1
+++ b/metadata/md5-cache/dev-util/rizin-0.5.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://rizin.re/
 INHERIT=meson python-any-r1
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0 BSD LGPL-3 MIT
 RDEPEND=app-arch/lz4:0= app-arch/xz-utils dev-libs/capstone:0= dev-libs/libmspack dev-libs/libzip:0= dev-libs/openssl:0= >=dev-libs/tree-sitter-0.19.0 dev-libs/xxhash sys-apps/file sys-libs/zlib:0=
 RESTRICT=test? ( fetch ) !test? ( test )
 SLOT=0/0.5.1
 SRC_URI=mirror+https://github.com/rizinorg/rizin/releases/download/v0.5.1/rizin-src-v0.5.1.tar.xz test? ( https://github.com/rizinorg/rizin-testbins/archive/0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz -> rizin-testbins-0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz )
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=8a0a7d8d0117b33cb8ab93e87d9c430c
+_md5_=7f51a14cf38cd89322d8b38d6f83d402
diff --git a/metadata/md5-cache/dev-util/ydiff-1.2-r1 b/metadata/md5-cache/dev-util/ydiff-1.2-r1
index 8ae2702de95c..d700cd611197 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.2-r1
+++ b/metadata/md5-cache/dev-util/ydiff-1.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ymattw/ydiff
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-apps/less python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/y/ydiff/ydiff-1.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a97827ae239f8f158003264915dc3368
+_md5_=072ef8136ed1f341195cfbcf5be5d17e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e95b6220336d..6fcce4822c98 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-cola-4.1.0 b/metadata/md5-cache/dev-vcs/git-cola-4.1.0
index 9f279c9851a0..3ddb5ef2694c 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-4.1.0
+++ b/metadata/md5-cache/dev-vcs/git-cola-4.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://git-cola.github.io/
 INHERIT=distutils-r1 readme.gentoo-r1 virtualx xdg-utils
 IUSE=test doc test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/PyQt5[python_targets_python3_9(-),gui,widgets] dev-python/QtPy[gui,network,python_targets_python3_9(-)] dev-python/send2trash[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/PyQt5[python_targets_python3_10(-),gui,widgets] dev-python/QtPy[gui,network,python_targets_python3_10(-)] dev-python/send2trash[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pygments[python_targets_python3_11(-)] dev-python/PyQt5[python_targets_python3_11(-),gui,widgets] dev-python/QtPy[gui,network,python_targets_python3_11(-)] dev-python/send2trash[python_targets_python3_11(-)] ) dev-vcs/git python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v4.1.0.tar.gz -> git-cola-4.1.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b8bbb897fe54c32eaef4073f3e963f65
+_md5_=85a0c1c920b37667b924e106679a547f
diff --git a/metadata/md5-cache/dev-vcs/git-machete-3.17.0 b/metadata/md5-cache/dev-vcs/git-machete-3.17.0
new file mode 100644
index 000000000000..629943c0f397
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-machete-3.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-mock-3.10.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ) ) test? ( dev-vcs/git >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Probably the sharpest git repo organizer & rebase/merge workflow automation tool
+EAPI=8
+HOMEPAGE=https://github.com/VirtusLab/git-machete https://pypi.org/project/git-machete/
+INHERIT=bash-completion-r1 distutils-r1
+IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/VirtusLab/git-machete/archive/refs/tags/v3.17.0.tar.gz -> git-machete-3.17.0.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0a9bb7b441fb15b279e300adccfd974e
diff --git a/metadata/md5-cache/dev-vcs/gitstats-0_pre20201124 b/metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
index 87eca9de4140..afa61f542ccf 100644
--- a/metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
+++ b/metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl:*
 DEFINED_PHASES=compile install prepare
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 DESCRIPTION=Statistics generator for git
 EAPI=7
 HOMEPAGE=http://gitstats.sourceforge.net/
 INHERIT=python-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sci-visualization/gnuplot[gd] dev-vcs/git
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sci-visualization/gnuplot[gd] dev-vcs/git
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/gktrk/gitstats/archive/0_pre20201124.tar.gz -> gitstats-0_pre20201124.tar.gz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=9bd849e9f9352d6cbdb57ea98706bd7c
+_md5_=83c8b2c888fa865699a845546feb04fe
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index cc9dbe1326f0..0d3f929d9bab 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1 b/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
index b26263c5afef..234a22ac5800 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
+++ b/metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
@@ -15,4 +15,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.4.0/Commander-Genius-v2.4.0.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e2366d8742cc7abe7840cad5da82228a
+_md5_=1d7538fe47858608d071355b60f40ff7
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 5f83b849f46e..6bd8e869f866 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/openmsx-18.0-r2 b/metadata/md5-cache/games-emulation/openmsx-18.0-r2
index 43cc21784c38..c6d25a09f091 100644
--- a/metadata/md5-cache/games-emulation/openmsx-18.0-r2
+++ b/metadata/md5-cache/games-emulation/openmsx-18.0-r2
@@ -13,4 +13,4 @@ RDEPEND=dev-lang/tcl:0= media-libs/alsa-lib media-libs/harfbuzz:= media-libs/lib
 SLOT=0
 SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_18_0/openmsx-18.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=240cff4005f8cc1bd147291193f98835
+_md5_=dc5afddf4c7e75af74c05d55bf1593e0
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2 b/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
index 481fd0d3f9aa..c995679ca30a 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hrydgard/ppsspp/releases/download/v1.14.4/ppsspp-1.14.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a72a7500b76eac0b1aa7f0ef17292443
+_md5_=00f0b68c558b00b3a3c8f2227c62e73e
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index f39b84f42513..8634ee4786da 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1 b/metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
index 9f6dbdfbecf2..0df0da5bf387 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
+++ b/metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.evolonline.org/manaplus/download/1.9.3.23/manaplus-1.9.3.23.tar.xz
-_md5_=dec3996a2a15e615c7c3dd4f8dce0de8
+_md5_=0c6ebd8bc6ef443ea47b2d0dbe140c64
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index d59beb937a43..42470acc4fc5 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19.3 b/metadata/md5-cache/games-server/minecraft-server-1.19.3
deleted file mode 100644
index a49cb203096f..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.19.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=amd64 ~arm64
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar -> minecraft-server-1.19.3.jar
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e9bffb44bb490bdb7d25c2437dbab725
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.19.4 b/metadata/md5-cache/games-server/minecraft-server-1.19.4
index 525f7a79dc3d..16c2644fcf15 100644
--- a/metadata/md5-cache/games-server/minecraft-server-1.19.4
+++ b/metadata/md5-cache/games-server/minecraft-server-1.19.4
@@ -5,11 +5,11 @@ DESCRIPTION=The official server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
 INHERIT=readme.gentoo-r1 java-pkg-2 systemd
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Mojang
 RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( dev-java/openjdk:17 dev-java/openjdk-bin:17 ) >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://launcher.mojang.com/v1/objects/8f3112a1049751cc472ec13e397eade5336ca7ae/server.jar -> minecraft-server-1.19.4.jar
 _eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e2eadbc965d8f12cfa81ff71a0741934
+_md5_=a2af5c014034fe2d4fc11d77dc3e5480
diff --git a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16 b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
deleted file mode 100644
index 227025cdcc11..000000000000
--- a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
-DESCRIPTION=A spaceship bridge simulator game
-EAPI=8
-HOMEPAGE=https://daid.github.io/EmptyEpsilon/
-INHERIT=cmake toolchain-funcs
-KEYWORDS=amd64
-LICENSE=Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT
-RDEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
-SLOT=0
-SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.03.16.tar.gz -> EmptyEpsilon-2022.03.16.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.03.16.tar.gz -> SeriousProton-2022.03.16.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=eeaceee6ea159c7221f29a57ed7e7b82
diff --git a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28 b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
index b722ad2e13eb..70d2c5676a9e 100644
--- a/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
+++ b/metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
@@ -9,6 +9,6 @@ KEYWORDS=amd64
 LICENSE=Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT
 RDEPEND=dev-cpp/nlohmann_json media-libs/freetype media-libs/libsdl2 >=media-libs/glm-0.9.9.8
 SLOT=0
-SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.10.28.tar.gz -> EmptyEpsilon-2022.10.28.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.10.28.tar.gz -> SeriousProton-2022.10.28.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz
+SRC_URI=https://github.com/daid/EmptyEpsilon/archive/EE-2022.10.28.tar.gz -> EmptyEpsilon-2022.10.28.tar.gz https://github.com/daid/SeriousProton/archive/EE-2022.10.28.tar.gz -> SeriousProton-2022.10.28.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_update2.tar.gz -> basis_universal_1_15_update2.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16.tar.gz -> meshoptimizer-0.16.tar.gz https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch -> SeriousProton-2022.10.28-add-missing-cstdint-include.patch https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch -> EmptyEpsilon-2022.10.28-musl-and-ppc.patch
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8dde06a12bb22ae98d3437f97d65388f
+_md5_=db205d9948aa2c00314d9dfb58423ae6
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 32cd09c6fe1d..23272624b177 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.3 b/metadata/md5-cache/games-simulation/openrct2-0.4.3
deleted file mode 100644
index 5d43348cba13..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=8
-HOMEPAGE=https://openrct2.org/
-INHERIT=cmake readme.gentoo-r1 xdg-utils
-IUSE=dedicated +flac +opengl scripting test +truetype +vorbis
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.3.tar.gz -> openrct2-0.4.3.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.3.7/objects.zip -> openrct2-objects-1.3.7.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.70/replays.zip -> openrct2-replays-0.0.70.zip )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0390942718aa79ef7f301d872121d213
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.4 b/metadata/md5-cache/games-simulation/openrct2-0.4.4
index f67fdd2122b1..55ff075c5b12 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.4.4
+++ b/metadata/md5-cache/games-simulation/openrct2-0.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openrct2.org/
 INHERIT=cmake readme.gentoo-r1 xdg-utils
 IUSE=dedicated +flac +opengl scripting test +truetype +vorbis
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp flac? ( media-libs/flac:= ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.4.tar.gz -> openrct2-0.4.4.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.3.8/objects.zip -> openrct2-objects-1.3.8.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.77/replays.zip -> openrct2-replays-0.0.77.zip )
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3243a7b33c0a95cb9783d02504910cea
+_md5_=3a2730c8af2d289e36bd4c416274e40e
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index c634553bd407..9dab1a50c382 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha b/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
index 40208abd82f5..df7b4526f071 100644
--- a/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
+++ b/metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.2.0-alpha.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=abfc3e0c25c876043c95ff139707d86d
+_md5_=277c1ab21b73185cc888fc6c65e990f5
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.9.16.1 b/metadata/md5-cache/games-strategy/endless-sky-0.9.16.1
index 5b73da591918..4bcb1651c5ee 100644
--- a/metadata/md5-cache/games-strategy/endless-sky-0.9.16.1
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.9.16.1
@@ -13,4 +13,4 @@ RDEPEND=media-libs/libjpeg-turbo:= media-libs/libmad media-libs/libpng:= media-l
 SLOT=0
 SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.16.1.tar.gz -> endless-sky-0.9.16.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=13883b911053d5d923cc230b5a794d1d
+_md5_=a052b78b65ad9e3ae22f27fb17233e29
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 23aefd48be76..09cb72fa888d 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-44.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-44.1
new file mode 100644
index 000000000000..9a1d4bdbc578
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-44.1
@@ -0,0 +1,18 @@
+BDEPEND=sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ) gnome-base/gnome-session ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=sci-geosciences/geocode-glib-3.10:2 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.2.0:4= colord? ( >=x11-misc/colord-1.4.5:= ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 dev-libs/libgudev:= wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7:= >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.90.0:4= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) x11-base/xorg-proto
+DESCRIPTION=Gnome Settings Daemon
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
+IUSE=+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=sci-geosciences/geocode-glib-3.10:2 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.2.0:4= colord? ( >=x11-misc/colord-1.4.5:= ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 dev-libs/libgudev:= wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7:= >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.90.0:4= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) gnome-base/dconf elogind? ( sys-auth/elogind )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-settings-daemon/44/gnome-settings-daemon-44.1.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b9b8301133f76601db3888fdf80e95ef
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f4a0082882fa..e150a5d35b25 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-firmware-43.2 b/metadata/md5-cache/gnome-extra/gnome-firmware-43.2
index a196cd3865d3..b550c7cc4075 100644
--- a/metadata/md5-cache/gnome-extra/gnome-firmware-43.2
+++ b/metadata/md5-cache/gnome-extra/gnome-firmware-43.2
@@ -7,10 +7,10 @@ HOMEPAGE=https://gitlab.gnome.org/World/gnome-firmware
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg
 IUSE=+man elogind systemd
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=>=gui-libs/gtk-4.2:4 dev-libs/glib:2 >=sys-apps/fwupd-1.7.5[elogind?,systemd?] >=dev-libs/libxmlb-0.1.7:= >=gui-libs/libadwaita-1.0.0:1 elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hughsient/releases/gnome-firmware-43.2.tar.xz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c3ee760a63694548103bc67c2f89b59
+_md5_=5ff25113ba92cd2a0cdc114393667395
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1
new file mode 100644
index 000000000000..39d400eeec81
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Show tooltip with full name and description
+EAPI=8
+HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
+INHERIT=gnome2-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
+SLOT=0
+SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v16.tar.gz -> gnome-shell-extension-applications-overview-tooltip-16.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=91f74055d56da4c02e6c8395c9e8d1ad
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45
index 66a7e80ba9f3..97fbb8d5ab41 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45
@@ -3,10 +3,10 @@ DESCRIPTION=Changes your wallpaper daily to the bing.com background image
 EAPI=8
 HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36
 SLOT=0
 SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v45.tar.gz -> gnome-shell-extension-bing-wallpaper-45.tar.gz
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2570fd030e50de8b174c532ff41a9863
+_md5_=dcf790cfddaf02c5819b9cdd1f39c20d
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30
deleted file mode 100644
index 6530373e1b81..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
-EAPI=8
-HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
-INHERIT=gnome2-utils
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
-SLOT=0
-SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v30.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-30.tar.gz
-_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f136848a651b576f14e06310799ec5b3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33
index 6cd2718dad3f..500e366ca3b8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33
@@ -3,10 +3,10 @@ DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
 EAPI=8
 HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
 SLOT=0
 SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v33.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-33.tar.gz
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=82b49d2585064e1eaad8d9af8f4dd3fb
+_md5_=b98aebeba5b1c8576cafb282f3be3556
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-55 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-55
deleted file mode 100644
index 341eec92b0ef..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-55
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2
-DESCRIPTION=An icon taskbar for the Gnome Shell
-EAPI=8
-HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
-INHERIT=gnome2-utils
-IUSE=branding
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-42
-SLOT=0
-SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v55.tar.gz -> gnome-shell-extension-dash-to-panel-55.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b587756f4bbe772984a3c179eff13dde
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2
new file mode 100644
index 000000000000..32a4ada894b4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Fork from the desktop-icons project, with several enhancements like Drag'n'Drop
+EAPI=8
+HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
+INHERIT=gnome2-utils meson
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
+SLOT=0
+SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/47.0.2/gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0a4f0bac1eb9008a17e956be436edf19
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1
new file mode 100644
index 000000000000..1a24f83f3d54
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DESCRIPTION=Display the current weather in the clock
+EAPI=8
+HOMEPAGE=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock
+INHERIT=gnome2-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 gnome-extra/gnome-weather
+SLOT=0
+SRC_URI=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/archive/38ba36090961a37260215ae04f4a7e0a1377da95.tar.gz -> gnome-shell-extension-weather-in-the-clock-20221024.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=75b8eabf864b18a2e25e37951dddcc2f
diff --git a/metadata/md5-cache/gnome-extra/pch-session-42.0-r1 b/metadata/md5-cache/gnome-extra/pch-session-42.0-r1
deleted file mode 100644
index e70d1574b931..000000000000
--- a/metadata/md5-cache/gnome-extra/pch-session-42.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DESCRIPTION=Unofficial gnome based session with different default settings and extensions
-EAPI=8
-HOMEPAGE=https://gitlab.com/pachoramos/pch-session
-INHERIT=gnome2-utils
-IUSE=bluetooth qt5 webp
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gnome-shell-42 >=gnome-extra/gnome-shell-extensions-42 >=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 >=gnome-extra/gnome-shell-extension-appindicator-42 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 >=gnome-extra/gnome-shell-extension-bing-wallpaper-40 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 >=gnome-extra/gnome-shell-extension-dash-to-panel-47 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 >=gnome-extra/gnome-shell-extension-gsconnect-50 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1 >=gnome-extra/gnome-tweaks-40.10 gnome-extra/gnome-clocks >=media-fonts/fonts-meta-2 bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
-SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/42.0/pch-session-42.0.tar.bz2
-_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=75a72e6ba0201d12291e2e493eb61881
diff --git a/metadata/md5-cache/gnome-extra/pch-session-43.2-r1 b/metadata/md5-cache/gnome-extra/pch-session-43.2-r1
index 88b7bc08a01b..9623935985ef 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-43.2-r1
+++ b/metadata/md5-cache/gnome-extra/pch-session-43.2-r1
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/pachoramos/pch-session
 INHERIT=gnome2-utils
 IUSE=bluetooth qt5 webp
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/gnome-shell-43 >=gnome-extra/gnome-shell-extensions-43 >=gnome-extra/gnome-shell-extension-alphabetical-grid-26.0 >=gnome-extra/gnome-shell-extension-appindicator-46 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16 >=gnome-extra/gnome-shell-extension-bing-wallpaper-44 >=gnome-extra/gnome-shell-extension-dash-to-panel-52 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-47 >=gnome-extra/gnome-shell-extension-gsconnect-54 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024 >=gnome-extra/gnome-tweaks-40.10 >=gnome-extra/gnome-clocks-43.0 >=media-fonts/fonts-meta-2 x11-themes/papirus-icon-theme bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
 SLOT=0
 SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/43.2/pch-session-43.2.tar.bz2
 _eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e868735931bbec27dd283727926f2ed7
+_md5_=77bedcde49d3ffc779b98326ac10203e
diff --git a/metadata/md5-cache/gnome-extra/pch-session-44.0 b/metadata/md5-cache/gnome-extra/pch-session-44.0
new file mode 100644
index 000000000000..8d7281ee5573
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/pch-session-44.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=Unofficial gnome based session with different default settings and extensions
+EAPI=8
+HOMEPAGE=https://gitlab.com/pachoramos/pch-session
+INHERIT=gnome2-utils
+IUSE=qt5 webp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gnome-shell-44 >=gnome-extra/gnome-shell-extensions-44 >=gnome-extra/gnome-shell-extension-alphabetical-grid-29.0 >=gnome-extra/gnome-shell-extension-appindicator-53 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1 >=gnome-extra/gnome-shell-extension-bing-wallpaper-45 >=gnome-extra/gnome-shell-extension-dash-to-panel-56 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2 >=gnome-extra/gnome-shell-extension-gsconnect-55 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1 >=gnome-extra/gnome-tweaks-40.10 >=gnome-extra/gnome-clocks-44.0 >=media-fonts/fonts-meta-2 x11-themes/papirus-icon-theme qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
+SLOT=0
+SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/44.0/pch-session-44.0.tar.bz2
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=89d2270a5d5f6102c6958174be47129a
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 71eedc419942..d15e64e9f556 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
index 1b1cd9a9fbe0..a8028f351f1a 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/frameworks/extra-cmake-modules
 INHERIT=cmake frameworks.kde.org python-any-r1
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.104
 SRC_URI=mirror://kde/stable/frameworks/5.104/extra-cmake-modules-5.104.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	frameworks.kde.org	6556398a532490b4d6d03158a82e455a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=10da7dc076d69f7e4c5dbd378850d9eb
+_md5_=3545a32322622e9dcc22bfb247730587
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index e08fadca76f9..df53a1c3d630 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r1 b/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
similarity index 98%
rename from metadata/md5-cache/kde-plasma/kscreen-5.27.4-r1
rename to metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
index ce1ae69221a1..bf224ec675d3 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r1
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e39e62856123f6831888fea1e0a303a
+_md5_=43700e7be0394f3d7dd728e77ea02be5
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r1 b/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
similarity index 98%
rename from metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r1
rename to metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
index 15a437e972c1..ce8db73166f5 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r1
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/8
 SRC_URI=mirror://kde/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7362c2bbd283fd2e51f31c36be71c78b
+_md5_=10dd18dec9ec1dd55cd188d71a387bd1
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.27.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.27.4-r1
similarity index 98%
rename from metadata/md5-cache/kde-plasma/plasma-nm-5.27.4
rename to metadata/md5-cache/kde-plasma/plasma-nm-5.27.4-r1
index d12b13062c1f..e1221c16a915 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.27.4
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.27.4-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99621564d8522209ef11a4db30687a60
+_md5_=5e126d89ead2e9998ab0233040420a4c
diff --git a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1 b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1
deleted file mode 100644
index 0754a5689327..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) dev-qt/qtcore:5
-DESCRIPTION=A friendly onboarding wizard for Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=ecm plasma.kde.org
-IUSE=telemetry debug
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1ce0e5da1c95f9b63ff695b631174b0a
diff --git a/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1-r1 b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1-r1
new file mode 100644
index 000000000000..cbc23202103a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.102.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 kaccounts? ( kde-apps/kaccounts-integration:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-qt/qtcore:5
+DESCRIPTION=A friendly onboarding wizard for Plasma
+EAPI=8
+HOMEPAGE=https://kde.org/plasma-desktop
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm plasma.kde.org
+IUSE=discover +kaccounts telemetry debug
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knewstuff-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 kaccounts? ( kde-apps/kaccounts-integration:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) discover? ( kde-plasma/discover:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plasma.kde.org	53d92c8467317e55e197227d2ddef69a	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8876f73820c20ae0df6652903fe13865
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 02a3210ff20d..57e02f52c053 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
index ffa0c295890c..46dd680c7aba 100644
--- a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/courier-pythonfilter/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.4.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=08c84dedc303797f590a35c57bc3c237
+_md5_=3daaab4d9e447969bd9243175c26b73c
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 10c3eebafada..e3891985d650 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.7.5 b/metadata/md5-cache/mail-mta/postfix-3.7.5
new file mode 100644
index 000000000000..50118b1fc273
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.7.5
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=8
+HOMEPAGE=http://www.postfix.org/
+INHERIT=pam systemd toolchain-funcs
+IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.7.5.tar.gz
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a25421afbd3f00511c9f847fca77d9d2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 27f200766f46..8a9244284ea6 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.85-r1 b/metadata/md5-cache/media-gfx/asymptote-2.85-r1
index 04bc3fefc3ba..b723e39e3a7a 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.85-r1
+++ b/metadata/md5-cache/media-gfx/asymptote-2.85-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://asymptote.sourceforge.io/
 INHERIT=autotools elisp-common latex-package python-r1
 IUSE=+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp offscreen +opengl python sigsegv svg test vim-syntax X python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= net-libs/libtirpc:= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1:= ) gsl? ( sci-libs/gsl:= ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) curl? ( net-misc/curl ) lsp? ( dev-libs/boost dev-libs/rapidjson dev-libs/utfcpp ) X? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) dev-python/PyQt5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) context? ( dev-texlive/texlive-context ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) offscreen? ( opengl ) doc? ( boehm-gc )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.85.src.tgz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	latex-package	c20e442c3953c765f636630631c96194	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c4792a82a745bf7e8fe4d2c7ce1b56c3
+_md5_=b390c1713e6fc05fb52c3f8e863c9126
diff --git a/metadata/md5-cache/media-gfx/cura-4.13.1-r1 b/metadata/md5-cache/media-gfx/cura-4.13.1-r1
index 27bf2938f1dc..0a8636312078 100644
--- a/metadata/md5-cache/media-gfx/cura-4.13.1-r1
+++ b/metadata/md5-cache/media-gfx/cura-4.13.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) sys-devel/gettext python_single_target_python3_9? ( test? ( dev-python/pytest[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( test? ( dev-python/pytest[python_targets_python3_10(-)] ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ~dev-libs/libarcus-4.13.1:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libcharon-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libsavitar-4.13.0:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/pynest2d-4.13_beta[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/uranium-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~media-gfx/curaengine-4.13.1 ~media-gfx/fdm-materials-4.13.0 dev-qt/qtquickcontrols[widgets] python_single_target_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/PyQt5[-debug,python_targets_python3_9(-)] dev-python/PyQt5-sip[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sentry-sdk[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/trimesh[python_targets_python3_9(-)] usb? ( dev-python/pyserial[python_targets_python3_9(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/importlib_metadata[python_targets_python3_10(-)] dev-python/keyring[python_targets_python3_10(-)] dev-python/mypy[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/PyQt5[-debug,python_targets_python3_10(-)] dev-python/PyQt5-sip[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sentry-sdk[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/trimesh[python_targets_python3_10(-)] usb? ( dev-python/pyserial[python_targets_python3_10(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_10(-)] ) )
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ~dev-libs/libarcus-4.13.1:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libcharon-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libsavitar-4.13.0:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/pynest2d-4.13_beta[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/uranium-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~media-gfx/curaengine-4.13.1 ~media-gfx/fdm-materials-4.13.0 dev-qt/qtquickcontrols[widgets] python_single_target_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/PyQt5[-debug,python_targets_python3_9(-)] dev-python/PyQt5-sip[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sentry-sdk[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/trimesh[python_targets_python3_9(-)] usb? ( dev-python/pyserial[python_targets_python3_9(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/importlib-metadata[python_targets_python3_10(-)] dev-python/keyring[python_targets_python3_10(-)] dev-python/mypy[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/PyQt5[-debug,python_targets_python3_10(-)] dev-python/PyQt5-sip[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sentry-sdk[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/trimesh[python_targets_python3_10(-)] usb? ( dev-python/pyserial[python_targets_python3_10(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_10(-)] ) )
 DESCRIPTION=A 3D model slicing application for 3D printing
 EAPI=8
 HOMEPAGE=https://github.com/Ultimaker/Cura
@@ -9,10 +9,10 @@ INHERIT=cmake desktop python-single-r1 xdg
 IUSE=debug test +usb zeroconf python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ~dev-libs/libarcus-4.13.1:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libcharon-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libsavitar-4.13.0:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/pynest2d-4.13_beta[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/uranium-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~media-gfx/curaengine-4.13.1 ~media-gfx/fdm-materials-4.13.0 dev-qt/qtquickcontrols[widgets] python_single_target_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/PyQt5[-debug,python_targets_python3_9(-)] dev-python/PyQt5-sip[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sentry-sdk[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/trimesh[python_targets_python3_9(-)] usb? ( dev-python/pyserial[python_targets_python3_9(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/importlib_metadata[python_targets_python3_10(-)] dev-python/keyring[python_targets_python3_10(-)] dev-python/mypy[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/PyQt5[-debug,python_targets_python3_10(-)] dev-python/PyQt5-sip[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sentry-sdk[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/trimesh[python_targets_python3_10(-)] usb? ( dev-python/pyserial[python_targets_python3_10(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_10(-)] ) )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ~dev-libs/libarcus-4.13.1:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libcharon-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-libs/libsavitar-4.13.0:=[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/pynest2d-4.13_beta[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~dev-python/uranium-4.13.0[python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ~media-gfx/curaengine-4.13.1 ~media-gfx/fdm-materials-4.13.0 dev-qt/qtquickcontrols[widgets] python_single_target_python3_9? ( dev-python/importlib-metadata[python_targets_python3_9(-)] dev-python/keyring[python_targets_python3_9(-)] dev-python/mypy[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/PyQt5[-debug,python_targets_python3_9(-)] dev-python/PyQt5-sip[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/sentry-sdk[python_targets_python3_9(-)] dev-python/shapely[python_targets_python3_9(-)] dev-python/trimesh[python_targets_python3_9(-)] usb? ( dev-python/pyserial[python_targets_python3_9(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/importlib-metadata[python_targets_python3_10(-)] dev-python/keyring[python_targets_python3_10(-)] dev-python/mypy[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/PyQt5[-debug,python_targets_python3_10(-)] dev-python/PyQt5-sip[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/sentry-sdk[python_targets_python3_10(-)] dev-python/shapely[python_targets_python3_10(-)] dev-python/trimesh[python_targets_python3_10(-)] usb? ( dev-python/pyserial[python_targets_python3_10(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/cura/archive/4.13.1.tar.gz -> cura-4.13.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=87093cdf4d1d29f15279d862e3d5be8f
+_md5_=32e29cbd254216fbf260758b83841366
diff --git a/metadata/md5-cache/media-gfx/feh-3.10 b/metadata/md5-cache/media-gfx/feh-3.10
new file mode 100644
index 000000000000..77efbc314e82
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/feh-3.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=media-libs/imlib2[X,text(+)] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
+DESCRIPTION=A fast, lightweight imageviewer using imlib2
+EAPI=8
+HOMEPAGE=https://feh.finalrewind.org/
+INHERIT=toolchain-funcs xdg-utils
+IUSE=debug curl exif test xinerama inotify
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=feh
+RDEPEND=media-libs/imlib2[X,text(+)] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) media-libs/libjpeg-turbo:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://feh.finalrewind.org/feh-3.10.tar.bz2
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=24b3f1b6c86c9519216745824415ce3a
diff --git a/metadata/md5-cache/media-gfx/mcomix-2.1.0 b/metadata/md5-cache/media-gfx/mcomix-2.1.0
index 03f5b9aa47ad..9a83e5750070 100644
--- a/metadata/md5-cache/media-gfx/mcomix-2.1.0
+++ b/metadata/md5-cache/media-gfx/mcomix-2.1.0
@@ -7,7 +7,7 @@ HOMEPAGE=http://mcomix.sourceforge.net
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature xdg
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/pillow-6.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycairo-1.16.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.36.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-libs/libjpeg-turbo:0 x11-libs/gtk+:3[introspection] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mcomix/mcomix-2.1.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=92ba64638f330bd34b930ddf47765a67
+_md5_=613aaccb9e7292c52b4705583fa41cf1
diff --git a/metadata/md5-cache/media-gfx/superslicer-2.5.59.2 b/metadata/md5-cache/media-gfx/superslicer-2.5.59.2
new file mode 100644
index 000000000000..9c4e3291dadd
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/superslicer-2.5.59.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl] media-libs/qhull[static-libs]
+DESCRIPTION=A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)
+EAPI=8
+HOMEPAGE=https://github.com/supermerill/SuperSlicer/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake wxwidgets xdg flag-o-matic
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT
+RDEPEND=dev-cpp/eigen:3 dev-cpp/tbb:= dev-libs/boost:=[nls] dev-libs/cereal dev-libs/expat dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= media-libs/libpng:0= media-libs/qhull:= sci-libs/nlopt >=sci-mathematics/cgal-5.0:= sys-apps/dbus sys-libs/zlib:= virtual/glu virtual/opengl x11-libs/gtk+:3 x11-libs/wxGTK:3.0-gtk3[X,opengl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/supermerill/SuperSlicer/archive/refs/tags/2.5.59.2.tar.gz -> superslicer-2.5.59.2.tar.gz https://github.com/slic3r/slic3r-profiles/archive/f6b1b123062a77101fe350f6d2a2a57be9adc684.tar.gz -> superslicer-2.5.59.2-profiles.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=33e1e4617da05b4b17a7545e843eb268
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5e056c4e6bff..3697331d7ea3 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libdiscid-0.6.4 b/metadata/md5-cache/media-libs/libdiscid-0.6.4
index 03f6e83bacea..79fc0619d5e0 100644
--- a/metadata/md5-cache/media-libs/libdiscid-0.6.4
+++ b/metadata/md5-cache/media-libs/libdiscid-0.6.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Client library to create MusicBrainz enabled tagging applications
 EAPI=8
 HOMEPAGE=http://musicbrainz.org/doc/libdiscid
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.6.4.tar.gz
-_md5_=042188a37d0d23a9744c3c72a11d536f
+_md5_=bf75f76b1218d4e7823c6248d024da1d
diff --git a/metadata/md5-cache/media-libs/libofa-0.9.3-r3 b/metadata/md5-cache/media-libs/libofa-0.9.3-r3
index 5d5a63837499..ca75b2f8c0b8 100644
--- a/metadata/md5-cache/media-libs/libofa-0.9.3-r3
+++ b/metadata/md5-cache/media-libs/libofa-0.9.3-r3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://code.google.com/p/musicip-libofa/
 INHERIT=autotools flag-o-matic multilib-minimal
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( APL-1.0 GPL-2 )
 RDEPEND=>=sci-libs/fftw-3.3.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://musicip-libofa.googlecode.com/files/libofa-0.9.3.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b0a1757a4c5aa0c85a4f12bc1e0c40e2
+_md5_=f3d58f498be195801c5ac1fbb92c101f
diff --git a/metadata/md5-cache/media-libs/libvisual-0.4.2 b/metadata/md5-cache/media-libs/libvisual-0.4.2-r1
similarity index 66%
rename from metadata/md5-cache/media-libs/libvisual-0.4.2
rename to metadata/md5-cache/media-libs/libvisual-0.4.2-r1
index 5a849eb32564..fec5c4d443b1 100644
--- a/metadata/md5-cache/media-libs/libvisual-0.4.2
+++ b/metadata/md5-cache/media-libs/libvisual-0.4.2-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install postinst test
-DEPEND=media-libs/libsdl
+DEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Abstraction library between applications and audio visualisation plugins
 EAPI=8
 HOMEPAGE=http://libvisual.org/
 INHERIT=multilib-minimal optfeature
 IUSE=debug nls threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=media-libs/libsdl
+RDEPEND=media-libs/libsdl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0.4
 SRC_URI=https://github.com/Libvisual/libvisual/releases/download/libvisual-0.4.2/libvisual-0.4.2.tar.bz2
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=06d6e8ab16c8d6fe6154e66c6c64e14c
+_md5_=05fdbb5a73cb0e21b2422bd53ee93adc
diff --git a/metadata/md5-cache/media-libs/opus-1.4 b/metadata/md5-cache/media-libs/opus-1.4
new file mode 100644
index 000000000000..57c640ca7df5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opus-1.4
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Open codec for interactive speech and music transmission over the Internet
+EAPI=8
+HOMEPAGE=https://opus-codec.org/
+INHERIT=flag-o-matic meson-multilib
+IUSE=custom-modes debug doc hardened static-libs test cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xiph/opus/releases/download/v1.4/opus-1.4.tar.gz
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=82e504b45a7d172cac534ed65ca0f9d4
diff --git a/metadata/md5-cache/media-libs/rubberband-3.1.1-r1 b/metadata/md5-cache/media-libs/rubberband-3.1.1-r1
deleted file mode 100644
index 56f2eb615f96..000000000000
--- a/metadata/md5-cache/media-libs/rubberband-3.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=8
-HOMEPAGE=https://www.breakfastquay.com/rubberband/
-INHERIT=meson-multilib flag-o-matic toolchain-funcs
-IUSE=ladspa jni static-libs +programs vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk ) programs? ( media-libs/libsndfile ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gcc:*
-SLOT=0
-SRC_URI=https://breakfastquay.com/files/releases/rubberband-3.1.1.tar.bz2
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c6519dd539bf140563147e8463e9be56
diff --git a/metadata/md5-cache/media-libs/rubberband-3.1.2 b/metadata/md5-cache/media-libs/rubberband-3.1.2
index fca1e108abcb..1a0c82e52dcf 100644
--- a/metadata/md5-cache/media-libs/rubberband-3.1.2
+++ b/metadata/md5-cache/media-libs/rubberband-3.1.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.breakfastquay.com/rubberband/
 INHERIT=meson-multilib flag-o-matic toolchain-funcs
 IUSE=ladspa lv2 jni static-libs +programs test vamp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jni? ( >=virtual/jdk-1.8:* ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) programs? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vamp? ( media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gcc:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-3.1.2.tar.bz2
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c9e75283a32a24f2a2e0bdf26890cad6
+_md5_=a02c8835e4d952617630cbb9587b9486
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 4004e90cdfca..c58deebd5ab2 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2 b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2
index 1642873da71b..86a2fee3841e 100644
--- a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2
+++ b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://libvisual.org/
 INHERIT=multilib-minimal
 IUSE=alsa debug gstreamer gtk jack mplayer opengl portaudio pulseaudio abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~media-libs/libvisual-0.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0.4
 SRC_URI=https://github.com/Libvisual/libvisual/releases/download/libvisual-plugins-0.4.2/libvisual-plugins-0.4.2.tar.bz2
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f6b1b206677759de49786dec4be6cd99
+_md5_=e2eceadb7ccb7ad999f6832a4711d6ca
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 733cd3f45017..a854f2e79c66 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/lilypond-2.24.0 b/metadata/md5-cache/media-sound/lilypond-2.24.0
index 854693e22a55..f04e9b5cfcc9 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.24.0
+++ b/metadata/md5-cache/media-sound/lilypond-2.24.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://lilypond.org/
 INHERIT=elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 IUSE=debug doc emacs profile l10n_ca l10n_cs l10n_de l10n_en l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pt l10n_zh python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~riscv x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 x11-libs/pango emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.24/lilypond-2.24.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4bfbcd76930948f58127a5061cea56a0
+_md5_=bd301263202c705f0e504f418229c8ea
diff --git a/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1 b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
index f4167fddf2d3..e79cfc275776 100644
--- a/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
+++ b/metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php
 INHERIT=autotools flag-o-matic
 IUSE=cpu_flags_x86_mmx static-libs
-KEYWORDS=~alpha amd64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 ~loong ppc ppc64 ~riscv sparc x86
 LICENSE=mac
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_4.11-u4-b5-s7.orig.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a69c6b501ad260bfaf7ad31762ea6a74
+_md5_=c516ca6deac782fcc3a1003c41e66b8c
diff --git a/metadata/md5-cache/media-sound/xmms2-0.9.2 b/metadata/md5-cache/media-sound/xmms2-0.9.2
index 91576e443052..3d147fa0997e 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.9.2
+++ b/metadata/md5-cache/media-sound/xmms2-0.9.2
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) virtual/pkgconfig perl? ( dev-perl/Pod-Parser ) python? ( python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) )
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) virtual/pkgconfig perl? ( dev-perl/Pod-Parser ) python? ( python_single_target_python3_9? ( <dev-python/cython-3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( <dev-python/cython-3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( <dev-python/cython-3[python_targets_python3_11(-)] ) )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-libs/glib:2 sys-libs/readline:= libvisual? ( media-libs/libsdl[opengl,video] media-libs/libvisual:0.4 ) server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/opusfile ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) cxx? ( dev-libs/boost ) test? ( dev-util/cunit )
 DESCRIPTION=X(cross)platform Music Multiplexing System, next generation of the XMMS player
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/XMMS2
 INHERIT=flag-o-matic optfeature perl-functions python-single-r1 waf-utils
 IUSE=cxx mlib-update perl python server test libvisual aac airplay alsa ao cdda curl ffmpeg flac fluidsynth gme ices jack mac +mad mms modplug mp3 musepack ofa opus oss pulseaudio samba sid sndfile speex tremor vocoder +vorbis wavpack xml zeroconf +server python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm ppc ~riscv x86
+KEYWORDS=~alpha amd64 ~arm ~loong ppc ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-libs/readline:= libvisual? ( media-libs/libsdl[opengl,video] media-libs/libvisual:0.4 ) server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/opusfile ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) perl? ( dev-lang/perl dev-perl/glib-perl virtual/perl-Carp virtual/perl-IO virtual/perl-Scalar-List-Utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject[python_targets_python3_11(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) test? ( server )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmms2/xmms2-devel/releases/download/0.9.2/xmms2-0.9.2.tar.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	5abcf99e5070e9e32e7b4d64ad438a65
-_md5_=b4626848d5148bca79a147d484afe162
+_md5_=d2e6d4b203487d87b494f12a5e8bb94b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 044b3133fb7e..04b0dd69972f 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-75.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-75.0.0
new file mode 100644
index 000000000000..0f014d939ab6
--- /dev/null
+++ b/metadata/md5-cache/media-video/mkvtoolnix-75.0.0
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.4:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.7.1:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
+DESCRIPTION=Tools to create, alter, and inspect Matroska files
+EAPI=8
+HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
+IUSE=dbus debug dvd gui nls pch test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.4:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.7.1:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-75.0.0.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2a01cce4945453ce7b795bb6cbb44157
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9999 b/metadata/md5-cache/media-video/mkvtoolnix-9999
index 66daf1eb515c..a94bd7c46ba3 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9999
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9999
@@ -13,4 +13,4 @@ RDEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.4:= >=dev-libs/li
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e5030718c5a21bfcbb2ff013bb3765ac
+_md5_=2a01cce4945453ce7b795bb6cbb44157
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.70 b/metadata/md5-cache/media-video/pipewire-0.3.70
new file mode 100644
index 000000000000..1f52afd59f84
--- /dev/null
+++ b/metadata/md5-cache/media-video/pipewire-0.3.70
@@ -0,0 +1,18 @@
+BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ) dbus? ( dev-util/gdbus-codegen ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Multimedia processing graphs
+EAPI=8
+HOMEPAGE=https://pipewire.org/
+INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev
+IUSE=bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT LGPL-2.1+ GPL-2
+PDEPEND=>=media-video/wireplumber-0.4.8-r3
+RDEPEND=acct-group/audio acct-group/pipewire media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( dev-libs/glib media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) ffmpeg? ( media-video/ffmpeg:= ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi ) virtual/tmpfiles
+REQUIRED_USE=ffmpeg? ( extra ) bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0/0.4
+SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.70/pipewire-0.3.70.tar.bz2
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=cc81c86789d6b1ec0dad1d76971487b9
diff --git a/metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201 b/metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201
index 3c1f4c1ae7e4..d44883fd8d89 100644
--- a/metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201
+++ b/metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201
@@ -7,11 +7,11 @@ HOMEPAGE=http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=media-video/mpv-0.25:=[libmpv] >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopengl[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-video/ffmpeg[X,encode] media-video/mediainfo python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/ozmartian/vidcutter/archive/8f01c76f0ec727fa336cb2cb6a645a58e3a29e64.tar.gz -> vidcutter-6.0.5.1_p20230201.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=02d35c7b18223bb59f286c51a9cc2995
+_md5_=57bb59e7884f80a0776bea9f0a0aa192
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 69acc472cb98..5f2bccfea9ba 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/flowgrind-0.8.0-r2 b/metadata/md5-cache/net-analyzer/flowgrind-0.8.0-r2
deleted file mode 100644
index 443bd5fc47b1..000000000000
--- a/metadata/md5-cache/net-analyzer/flowgrind-0.8.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/xmlrpc-c:=[abyss,curl] sys-apps/util-linux gsl? ( sci-libs/gsl:= ) pcap? ( net-libs/libpcap )
-DESCRIPTION=Network performance measurement tool
-EAPI=7
-HOMEPAGE=http://flowgrind.net/ https://github.com/flowgrind/flowgrind/
-IUSE=debug doc gsl pcap
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/xmlrpc-c:=[abyss,curl] sys-apps/util-linux gsl? ( sci-libs/gsl:= ) pcap? ( net-libs/libpcap )
-SLOT=0
-SRC_URI=https://github.com/flowgrind/flowgrind/releases/download/flowgrind-0.8.0/flowgrind-0.8.0.tar.bz2
-_md5_=93c1b5f859a3d148a49093f3f7eb4757
diff --git a/metadata/md5-cache/net-analyzer/flowgrind-0.8.2 b/metadata/md5-cache/net-analyzer/flowgrind-0.8.2
index bda95ce36152..1a9dd7167971 100644
--- a/metadata/md5-cache/net-analyzer/flowgrind-0.8.2
+++ b/metadata/md5-cache/net-analyzer/flowgrind-0.8.2
@@ -4,10 +4,10 @@ DEPEND=dev-libs/xmlrpc-c:=[abyss,curl] sys-apps/util-linux gsl? ( sci-libs/gsl:=
 DESCRIPTION=Network performance measurement tool
 EAPI=8
 HOMEPAGE=http://flowgrind.net/ https://github.com/flowgrind/flowgrind/
-IUSE=debug doc gsl pcap
+IUSE=doc gsl pcap
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/xmlrpc-c:=[abyss,curl] sys-apps/util-linux gsl? ( sci-libs/gsl:= ) pcap? ( net-libs/libpcap )
 SLOT=0
 SRC_URI=https://github.com/flowgrind/flowgrind/releases/download/flowgrind-0.8.2/flowgrind-0.8.2.tar.bz2
-_md5_=731ab111fbb7ed1749af61ec35639b26
+_md5_=b05be50015a541e0f231a33036865a91
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1
deleted file mode 100644
index 7acc2388c4fb..000000000000
--- a/metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison >=sys-devel/flex-2.5.35 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd
-DESCRIPTION=Distributed, general purpose, network monitoring engine
-EAPI=7
-HOMEPAGE=https://icinga.com/
-INHERIT=cmake systemd
-IUSE=console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0= dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl:= acct-user/icinga acct-group/icinga acct-group/icingacmd plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) acct-group/nagios
-REQUIRED_USE=!minimal? ( || ( mariadb mysql postgres ) )
-SLOT=0
-SRC_URI=https://github.com/Icinga/icinga2/archive/v2.13.6.tar.gz -> icinga2-2.13.6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=529467850ee9c1f9f8454a41ad546758
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
deleted file mode 100644
index 4764e85456b6..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Nagios plugin to execute multiple checks in parallel
-EAPI=7
-HOMEPAGE=https://github.com/clarkbox/check_multiple
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=0cc54d7bb7838f68e561ab6fbe3beed0
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2
index 5b772721056f..d3db00d937ef 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/clarkbox/check_multiple
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b1fc373b039e7ae409dfedffd9dc0e99
+_md5_=d3b31062e11724897da57355cc6238ab
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
deleted file mode 100644
index 0bb9f9335fe5..000000000000
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Nagios plugin to check whether an OpenVPN server is alive
-EAPI=7
-HOMEPAGE=https://github.com/liquidat/nagios-icinga-openvpn
-INHERIT=distutils-r1
-IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ee88dcee44317b83fd855e197f848b44
diff --git a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3 b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3
index 6323ca31c5e7..d937680cc7e4 100644
--- a/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3
+++ b/metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/liquidat/nagios-icinga-openvpn
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/liquidat/nagios-icinga-openvpn/archive/0.0.1.tar.gz -> nagios-icinga-openvpn-0.0.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=2eb51f1319eefb156f2f80ba5154b43d
+_md5_=0b8466c31f7ee1cfef9347e7e07cdc1f
diff --git a/metadata/md5-cache/net-analyzer/sngrep-1.7.0 b/metadata/md5-cache/net-analyzer/sngrep-1.7.0
new file mode 100644
index 000000000000..e1abd9c17dde
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sngrep-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure prepare
+DEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)] ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) pcre? ( dev-libs/libpcre2 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Ncurses SIP Messages flow viewer
+EAPI=8
+HOMEPAGE=https://github.com/irontec/sngrep
+INHERIT=autotools
+IUSE=eep gnutls pcre ssl zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-libs/libpcap sys-libs/ncurses:=[unicode(+)] ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) ) pcre? ( dev-libs/libpcre2 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/irontec/sngrep/releases/download/v1.7.0/sngrep-1.7.0.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=03f203be9fe7fe201e5bdc1531d248c5
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index f09229d2ad40..06de0b06d650 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2 b/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
deleted file mode 100644
index 29480884e842..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_25.tar.gz -> freeradius-3.0.25.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bc93bbb0acb5b4832f47511660a93ed9
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.26 b/metadata/md5-cache/net-dialup/freeradius-3.0.26
deleted file mode 100644
index 32ead80a2baa..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.26
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=7
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam pcap postgres python readline redis rest samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:0= ) redis? ( dev-libs/hiredis:= ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) systemd? ( sys-apps/systemd )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/archive/release_3_0_26.tar.gz -> freeradius-3.0.26.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=abb76326388851961671fc23753b7cff
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.0 b/metadata/md5-cache/net-dialup/freeradius-3.2.0
deleted file mode 100644
index ddee56cb6611..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=8
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_0/freeradius-server-3.2.0.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=835edd8720e4ab8b60ed47bfa7c79fb1
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.2.1 b/metadata/md5-cache/net-dialup/freeradius-3.2.1
deleted file mode 100644
index c016ccae1e30..000000000000
--- a/metadata/md5-cache/net-dialup/freeradius-3.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=compile config configure install preinst prepare setup
-DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=Highly configurable free RADIUS server
-EAPI=8
-HOMEPAGE=https://freeradius.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam postgres python readline redis samba sqlite ssl systemd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-libs/libltdl dev-libs/libpcre dev-libs/json-c:= dev-lang/perl:= net-libs/libpcap sys-libs/gdbm:= sys-libs/libcap sys-libs/talloc virtual/libcrypt:= firebird? ( dev-db/firebird ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) odbc? ( dev-db/unixODBC ) oracle? ( dev-db/oracle-instantclient[sdk] ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:= ) redis? ( dev-libs/hiredis:= ) samba? ( net-fs/samba ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] ) systemd? ( sys-apps/systemd:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=firebird? ( bindist )
-SLOT=0
-SRC_URI=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_1/freeradius-server-3.2.1.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	4efe951aa8ce2c16288d7c915196fe29	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=870293cc160b353f7ac95c1f2c0c3e0e
diff --git a/metadata/md5-cache/net-dialup/minicom-2.8-r1 b/metadata/md5-cache/net-dialup/minicom-2.8-r1
deleted file mode 100644
index 0c22b39446bd..000000000000
--- a/metadata/md5-cache/net-dialup/minicom-2.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=sys-libs/ncurses:=
-DESCRIPTION=Serial Communication Program
-EAPI=7
-HOMEPAGE=https://salsa.debian.org/minicom-team/minicom
-INHERIT=autotools
-IUSE=nls
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:= net-dialup/lrzsz
-SLOT=0
-SRC_URI=https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/minicom-2.8.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a5b67d2613d0d37f488aabbd17d00742
diff --git a/metadata/md5-cache/net-dialup/minicom-2.8-r2 b/metadata/md5-cache/net-dialup/minicom-2.8-r2
index c00881fe691c..af26f8ba7aad 100644
--- a/metadata/md5-cache/net-dialup/minicom-2.8-r2
+++ b/metadata/md5-cache/net-dialup/minicom-2.8-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://salsa.debian.org/minicom-team/minicom
 INHERIT=autotools
 IUSE=nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= net-dialup/lrzsz
 SLOT=0
 SRC_URI=https://salsa.debian.org/minicom-team/minicom/-/archive/2.8/minicom-2.8.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c04aaa76a5d971e678f62efcfa824fff
+_md5_=c190a7d85470dd991a5d1afaabc8d2b6
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 4c0773536171..45b8563099c6 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1 b/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
index 6503f31a235b..8d0425b51894 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
+++ b/metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.7.3.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e826ee83d13ca2992e40cad121bfa681
+_md5_=83a50bae12bf343235d0eb5ad7b10ec1
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 9da7f5ed6521..463ac640df40 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.6.3 b/metadata/md5-cache/net-fs/nfs-utils-2.6.3
new file mode 100644
index 000000000000..93c2c1ad00e0
--- /dev/null
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.6.3
@@ -0,0 +1,17 @@
+BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=NFS client and server daemons
+EAPI=8
+HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
+INHERIT=autotools linux-info systemd
+IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
+REQUIRED_USE=kerberos? ( nfsv4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.3.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=d0a365cc7bdf0bea0830d13337af9731
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 488911fd54ba..4dbe59de87cc 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/gftp-2.9.1b b/metadata/md5-cache/net-ftp/gftp-2.9.1b
index a88cdac7724c..52b0908bfe1c 100644
--- a/metadata/md5-cache/net-ftp/gftp-2.9.1b
+++ b/metadata/md5-cache/net-ftp/gftp-2.9.1b
@@ -13,4 +13,4 @@ RDEPEND=dev-libs/glib:2 sys-libs/ncurses:0= sys-libs/readline:0 gtk? ( x11-libs/
 SLOT=0
 SRC_URI=https://github.com/masneyb/gftp/releases/download/2.9.1b/gftp-2.9.1b.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d2f92334b9eec0db80b8a41bf157a27a
+_md5_=af8ee9d86ea1d14ec5c4b64303cfcfcf
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 1f51e4cde802..4e2686a9eff1 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.11.23 b/metadata/md5-cache/net-im/element-desktop-bin-1.11.29
similarity index 96%
rename from metadata/md5-cache/net-im/element-desktop-bin-1.11.23
rename to metadata/md5-cache/net-im/element-desktop-bin-1.11.29
index dac1ca8e95e6..16411c1ac2d6 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.11.23
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.11.29
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-db/sqlcipher dev-libs/expat dev-libs/glib:2 dev-libs/nettle dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.23_amd64.deb
+SRC_URI=https://packages.element.io/debian/pool/main/e/element-desktop/element-desktop_1.11.29_amd64.deb
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	unpacker	aa6a4e924009232d8b78b31e932c30b5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3b016ac973b1bf5ad05126dbfc466d59
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index fc2528b02df4..9938f6e4982d 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/unrealircd-6.0.4.2 b/metadata/md5-cache/net-irc/unrealircd-6.0.4.2
index 647abc908724..f52be40ad25e 100644
--- a/metadata/md5-cache/net-irc/unrealircd-6.0.4.2
+++ b/metadata/md5-cache/net-irc/unrealircd-6.0.4.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.unrealircd.org/
 INHERIT=autotools ssl-cert systemd tmpfiles verify-sig
 IUSE=class-nofakelag curl geoip +operoverride operoverride-verify verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=GPL-2+
 RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:= dev-libs/jansson:= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] ) geoip? ( dev-libs/libmaxminddb ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://www.unrealircd.org/downloads/unrealircd-6.0.4.2.tar.gz verify-sig? ( https://www.unrealircd.org/downloads/unrealircd-6.0.4.2.tar.gz.asc )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=8b24e7c3f1ed835cefa6e9c9fa48814b
+_md5_=9451367728a0718537797d5a968aae18
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 26e9cc67de01..524afbcb3747 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-5.9.0 b/metadata/md5-cache/net-libs/ignition-msgs-5.11.0
similarity index 94%
rename from metadata/md5-cache/net-libs/ignition-msgs-5.9.0
rename to metadata/md5-cache/net-libs/ignition-msgs-5.11.0
index 8baa4bc7a833..ee3368e6a500 100644
--- a/metadata/md5-cache/net-libs/ignition-msgs-5.9.0
+++ b/metadata/md5-cache/net-libs/ignition-msgs-5.11.0
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf:= sci-libs/ignition-math:6= dev-libs/tinyxml2:=
 SLOT=5
-SRC_URI=https://github.com/ignitionrobotics/ign-msgs/archive/ignition-msgs5_5.9.0.tar.gz
+SRC_URI=https://github.com/ignitionrobotics/ign-msgs/archive/ignition-msgs5_5.11.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dbd83677db46a3e5716b08c9252a2937
+_md5_=d7c2defda3f7775ee1243342dcd0a91f
diff --git a/metadata/md5-cache/net-libs/ldns-1.8.3-r1 b/metadata/md5-cache/net-libs/ldns-1.8.3-r1
index 7d199b7be614..4e5fef6b4b99 100644
--- a/metadata/md5-cache/net-libs/ldns-1.8.3-r1
+++ b/metadata/md5-cache/net-libs/ldns-1.8.3-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.nlnetlabs.nl/projects/ldns/
 INHERIT=autotools python-single-r1 multilib-minimal
 IUSE=doc examples python static-libs python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) >=dev-libs/openssl-1.1.1l-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] examples? ( net-libs/libpcap ) !<net-dns/ldns-utils-1.8.0-r2
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/3
 SRC_URI=https://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ffe70a5b5a92d0542a92e8ca5eb1eaf4
+_md5_=258a5b5335039b4096befbf05ff40379
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index f182abd9590b..6c234a866f57 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.20-r2 b/metadata/md5-cache/net-mail/dovecot-2.3.20-r2
new file mode 100644
index 000000000000..9efcf0cd71f1
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.20-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:=
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=8
+HOMEPAGE=https://www.dovecot.org/
+INHERIT=autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+IUSE=kerberos ldap lua mysql pam postgres sqlite lz4 zstd argon2 caps doc lucene managesieve rpc selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind lua_single_target_lua5-1 lua_single_target_lua5-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= dev-libs/openssl:0= sys-libs/zlib:= virtual/libiconv argon2? ( dev-libs/libsodium:= ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) lucene? ( >=dev-cpp/clucene-2.3 ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/pam:= ) postgres? ( dev-db/postgresql:* ) rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) stemmer? ( dev-libs/snowball-stemmer:= ) suid? ( acct-group/mail ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) virtual/libcrypt:= acct-group/dovecot acct-group/dovenull acct-user/dovecot acct-user/dovenull net-mail/mailbase
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 ) )
+SLOT=0/2.3.20
+SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.20.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.20.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.20.tar.gz )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=0848d61c454449de737f3e0c08e1a88a
diff --git a/metadata/md5-cache/net-mail/mu-1.10.3 b/metadata/md5-cache/net-mail/mu-1.10.3
new file mode 100644
index 000000000000..e5346feaeb54
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mu-1.10.3
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
+EAPI=8
+HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
+INHERIT=elisp-common meson
+IUSE=emacs readline
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
+SLOT=0
+SRC_URI=https://github.com/djcb/mu/releases/download/v1.10.3/mu-1.10.3.tar.xz
+_eclasses_=elisp-common	dcd21c5d379fc2217e95f529504c5fe0	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=a95f2e374972d478eac50b29c2c9e897
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b9ce9f15995a..17a4b3f62503 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/dropbox-cli-2023 b/metadata/md5-cache/net-misc/dropbox-cli-2023
index 402920cd8df7..9d8e32c86e03 100644
--- a/metadata/md5-cache/net-misc/dropbox-cli-2023
+++ b/metadata/md5-cache/net-misc/dropbox-cli-2023
@@ -4,11 +4,11 @@ EAPI=8
 HOMEPAGE=https://www.dropbox.com/
 INHERIT=python-r1 bash-completion-r1
 IUSE=+gpg python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=net-misc/dropbox python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) gpg? ( app-crypt/gpgme[python] ) dev-python/pygobject:3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/dropbox-cli-2023.py.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7521f3165c5ee85c07e1658f69b438da
+_md5_=dbd31329737927588b39d89ce159c53d
diff --git a/metadata/md5-cache/net-misc/electrum-4.4.0 b/metadata/md5-cache/net-misc/electrum-4.4.0
new file mode 100644
index 000000000000..16b23af6f546
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.4.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] ) ) >=dev-python/pytest-7.2.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] ) >=dev-python/gpep517-13[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
+INHERIT=distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] ) <dev-libs/libsecp256k1-0.2 >=dev-python/aiohttp-socks-0.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bitstring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pbkdf2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/qrcode[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/protobuf-python-3.20[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ncurses? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses] ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[ncurses?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.4.0.tar.gz -> electrum-4.4.0.gh.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6fe91588235d948dde604672a15e0dec
diff --git a/metadata/md5-cache/net-misc/icaclient-23.3.0.32 b/metadata/md5-cache/net-misc/icaclient-23.3.0.32-r1
similarity index 95%
rename from metadata/md5-cache/net-misc/icaclient-23.3.0.32
rename to metadata/md5-cache/net-misc/icaclient-23.3.0.32-r1
index 1d8760fa073d..04e1f177d017 100644
--- a/metadata/md5-cache/net-misc/icaclient-23.3.0.32
+++ b/metadata/md5-cache/net-misc/icaclient-23.3.0.32-r1
@@ -7,9 +7,9 @@ INHERIT=desktop wrapper xdg-utils
 IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx usb
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=icaclient
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux sys-libs/libcxx sys-libs/libcxxabi sys-libs/zlib virtual/krb5 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango hdx? ( media-plugins/hdx-realtime-media-engine ) !hdx? ( !media-plugins/hdx-realtime-media-engine ) usb? ( sys-apps/systemd-utils )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux sys-libs/libcxx sys-libs/libcxxabi sys-libs/zlib virtual/krb5 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango hdx? ( media-plugins/hdx-realtime-media-engine ) !hdx? ( !media-plugins/hdx-realtime-media-engine ) usb? ( virtual/libudev )
 RESTRICT=mirror strip fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-23.3.0.32.tar.gz ) x86? ( linuxx86-23.3.0.32.tar.gz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=695800443be924c8c747db8e7e1f9fca
+_md5_=0c8e7fd0db968244ff86f1c0c15ad90b
diff --git a/metadata/md5-cache/net-misc/rygel-0.42.2 b/metadata/md5-cache/net-misc/rygel-0.42.2-r1
similarity index 85%
rename from metadata/md5-cache/net-misc/rygel-0.42.2
rename to metadata/md5-cache/net-misc/rygel-0.42.2-r1
index bcc7895dad38..75e71aac84de 100644
--- a/metadata/md5-cache/net-misc/rygel-0.42.2
+++ b/metadata/md5-cache/net-misc/rygel-0.42.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=|| ( dev-lang/vala:0.56 ) app-text/docbook-xml-dtd:4.5 >=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
+DEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
 DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
@@ -9,9 +9,9 @@ INHERIT=gnome.org meson systemd vala xdg
 IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
+RDEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.42/rygel-0.42.2.tar.xz
 _eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3e271f9ed9ae6f4b8776a2ebf79a68af
+_md5_=f20ef962fb1afa8e322f21b209795341
diff --git a/metadata/md5-cache/net-misc/rygel-0.42.2-r2 b/metadata/md5-cache/net-misc/rygel-0.42.2-r2
new file mode 100644
index 000000000000..a47b0e63ac01
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rygel-0.42.2-r2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/vala:0.56 ) app-text/docbook-xml-dtd:4.5 >=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
+DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson systemd vala xdg
+IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=>=net-libs/gupnp-1.5.2:1.6=[vala] >=dev-libs/libgee-0.8:0.8= >=net-libs/gssdp-1.5.0:1.6=[vala] >=dev-libs/glib-2.62.0:2 >=dev-libs/libxml2-2.7:2 >=net-libs/gupnp-av-0.14.1:=[vala] >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3:3.0 sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 x11-libs/gdk-pixbuf:2 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) tracker? ( app-misc/tracker:3=[vala(+)] ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) x11-libs/libX11
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rygel/0.42/rygel-0.42.2.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=35dbbece761a4f4e2f7c873f53de1481
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.3.0 b/metadata/md5-cache/net-misc/s3cmd-2.3.0
index 9d5dcba3ccae..532271ff4780 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.3.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.3.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://s3tools.org/s3cmd
 INHERIT=distutils-r1
 IUSE=python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~ia64 x86 ~amd64-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.3.0.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=948299fd897ae9117050ba51d5c00e38
+_md5_=6bd36b74384405971d3e4ec21962234c
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.13.1 b/metadata/md5-cache/net-misc/tigervnc-1.13.1
index d3808e46687f..03d392de6218 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.13.1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.13.1
@@ -7,11 +7,11 @@ HOMEPAGE=https://tigervnc.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 IUSE=dri3 +drm gnutls java nls +opengl +server +viewer xinerama java
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
 SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz -> tigervnc-1.13.1.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2acbfc002caedf55fb471bf2bf945c49
+_md5_=8ec73a3a7838d8f1ebca4be111073538
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
index 7b67ce1ccfc3..436370693cbf 100644
--- a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Metapackage for the xorg module provided by tigervnc
 EAPI=8
 HOMEPAGE=https://tigervnc.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=metapackage
 RDEPEND=~net-misc/tigervnc-1.13.1[server] =x11-base/xorg-server-21.1*
 SLOT=0
-_md5_=8b67f6b5aa003eb829a1da6bc63714b9
+_md5_=dc0991c354b6b75cdaf1919386a1b4a7
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 707bd2f8f420..bb7d011299a3 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/liferea-1.12.9-r2 b/metadata/md5-cache/net-news/liferea-1.12.9-r2
deleted file mode 100644
index 7b9744c892f7..000000000000
--- a/metadata/md5-cache/net-news/liferea-1.12.9-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
-EAPI=7
-HOMEPAGE=https://lzone.de/liferea/
-INHERIT=autotools gnome2-utils optfeature python-single-r1 xdg
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.9/liferea-1.12.9.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	eapi8-dosym	741bfa77afb2a9321261501aca58c208	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9d385ee3915d64c20742fe687266cf84
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index c89f3c12b9e9..2d73ec99440e 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.9.10 b/metadata/md5-cache/net-vpn/strongswan-5.9.10
index df5dbd92a292..6c4285dd621a 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.9.10
+++ b/metadata/md5-cache/net-vpn/strongswan-5.9.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.strongswan.org/
 INHERIT=linux-info systemd
 IUSE=+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11 +strongswan_plugins_gcm +strongswan_plugins_led +strongswan_plugins_lookip +strongswan_plugins_systime-fix +strongswan_plugins_unity +strongswan_plugins_vici strongswan_plugins_kdf strongswan_plugins_addrblock strongswan_plugins_aesni strongswan_plugins_blowfish strongswan_plugins_bypass-lan strongswan_plugins_ccm strongswan_plugins_chapoly strongswan_plugins_ctr strongswan_plugins_error-notify strongswan_plugins_forecast strongswan_plugins_ha strongswan_plugins_ipseckey strongswan_plugins_newhope strongswan_plugins_ntru strongswan_plugins_padlock strongswan_plugins_rdrand strongswan_plugins_save-keys strongswan_plugins_unbound strongswan_plugins_whitelist strongswan_plugins_xauth-noauth
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2 RSA DES
 RDEPEND=non-root? ( acct-user/ipsec acct-group/ipsec ) dev-libs/glib:2 gmp? ( >=dev-libs/gmp-4.1.5:= ) gcrypt? ( dev-libs/libgcrypt:= ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) ldap? ( net-nds/openldap:= ) openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist(-)] ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1:3 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns:= ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.9.10.tar.bz2
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3cba069bf07313ece641246a007ffaa4
+_md5_=5c56fb7038426d859cb9386e78fa448e
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 007b18b6d3ca..43231449c206 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.65-r1 b/metadata/md5-cache/net-wireless/bluez-5.65-r1
deleted file mode 100644
index ad7fd6d0436d..000000000000
--- a/metadata/md5-cache/net-wireless/bluez-5.65-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 )
-DESCRIPTION=Bluetooth Tools and System Daemons for Linux
-EAPI=8
-HOMEPAGE=http://www.bluez.org
-INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] btpclient? ( >=dev-libs/ell-0.39 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.39 >=dev-libs/json-c-0.13:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) >=sys-apps/dbus-1.6:= udev? ( >=virtual/udev-172 ) deprecated? ( !net-wireless/bluez-hcidump ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_9? ( >=dev-python/dbus-python-1[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/dbus-python-1[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) )
-REQUIRED_USE=btpclient? ( mesh ) extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) ) test-programs? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.65.tar.xz https://dev.gentoo.org/~pacho/bluez/power-state-adapter-property.patch
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b25f8bdf19a29a49b3b80a3e8a2f72f6
diff --git a/metadata/md5-cache/net-wireless/kismet-2022.08.1-r2 b/metadata/md5-cache/net-wireless/kismet-2022.08.1-r2
index f1e9f76b8fc1..86ef3e609ba3 100644
--- a/metadata/md5-cache/net-wireless/kismet-2022.08.1-r2
+++ b/metadata/md5-cache/net-wireless/kismet-2022.08.1-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.kismetwireless.net
 INHERIT=autotools python-single-r1 udev systemd
 IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager ) dev-libs/glib:2 dev-libs/elfutils sys-libs/zlib:= dev-db/sqlite:3 net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_9? ( dev-python/protobuf-python[python_targets_python3_9(-)] dev-python/websockets[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] dev-python/websockets[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/protobuf-python[python_targets_python3_11(-)] dev-python/websockets[python_targets_python3_11(-)] ) lm-sensors? ( sys-apps/lm-sensors:= ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyserial[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pyserial[python_targets_python3_11(-)] ) rtlsdr? ( python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) net-wireless/rtl-sdr ) selinux? ( sec-policy/selinux-kismet )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/2022.08.1
 SRC_URI=https://www.kismetwireless.net/code/kismet-2022-08-R1.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=adb2f29f36b24d4e1e7b3de3bfc3a364
+_md5_=3671248ff55e227d3fa11b7ff26c1c5e
diff --git a/metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2 b/metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2
index df5a950bd079..4462ca636e53 100644
--- a/metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2
+++ b/metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/kismetwireless/lorcon
 INHERIT=distutils-r1 flag-o-matic
 IUSE=python python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:3= net-libs/libpcap python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/lorcon/archive/4a81d6aaa2c6ac7253ecd182ffe97c6c89411196.tar.gz -> lorcon-2020.06.06_p20220216.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=c3cde4301582a25ac8096dc701135a23
+_md5_=9cd49b6a7cd0d6f686864acf6986361e
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index c1512d4ef3a7..60f4c1a2afb3 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.3.3 b/metadata/md5-cache/sci-chemistry/chemex-2022.3.3
new file mode 100644
index 000000000000..577f609933d6
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2022.3.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.3.3.tar.gz -> chemex-2022.3.3.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=dd228c801562e08a6fc5db8d56c90be2
diff --git a/metadata/md5-cache/sci-chemistry/chemex-2022.3.4 b/metadata/md5-cache/sci-chemistry/chemex-2022.3.4
new file mode 100644
index 000000000000..8a225dceb1f4
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-2022.3.4
@@ -0,0 +1,17 @@
+BDEPEND=test? ( python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.2.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.2.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.2.1[python_targets_python3_11(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( >=dev-python/gpep517-13[python_targets_python3_9(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-13[python_targets_python3_10(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-13[python_targets_python3_11(-)] >=dev-python/poetry-core-1.4.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=8
+HOMEPAGE=https://github.com/gbouvignies/chemex
+INHERIT=distutils-r1
+IUSE=test test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_9? ( >=dev-python/asteval-0.9.25[python_targets_python3_9(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_9(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_9(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_9(-)] >=dev-python/numpy-1.24.2[python_targets_python3_9(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_9(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_9(-)] >=dev-python/rich-13.3.4[python_targets_python3_9(-)] >=dev-python/scipy-1.10.1[python_targets_python3_9(-)] >=dev-python/tomli-2.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/asteval-0.9.25[python_targets_python3_10(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_10(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_10(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_10(-)] >=dev-python/numpy-1.24.2[python_targets_python3_10(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_10(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_10(-)] >=dev-python/rich-13.3.4[python_targets_python3_10(-)] >=dev-python/scipy-1.10.1[python_targets_python3_10(-)] >=dev-python/tomli-2.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/asteval-0.9.25[python_targets_python3_11(-)] >=dev-python/cachetools-5.3.0[python_targets_python3_11(-)] >=dev-python/lmfit-1.2.0[python_targets_python3_11(-)] >=dev-python/matplotlib-3.7.1[python_targets_python3_11(-)] >=dev-python/numpy-1.24.2[python_targets_python3_11(-)] >=dev-python/pydantic-1.10.7[python_targets_python3_11(-)] >=dev-python/rapidfuzz-3.0.0[python_targets_python3_11(-)] >=dev-python/rich-13.3.4[python_targets_python3_11(-)] >=dev-python/scipy-1.10.1[python_targets_python3_11(-)] >=dev-python/tomli-2.0.1[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/ChemEx/archive/refs/tags/v2022.3.4.tar.gz -> chemex-2022.3.4.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=dd228c801562e08a6fc5db8d56c90be2
diff --git a/metadata/md5-cache/sci-chemistry/dssp-4.2.0 b/metadata/md5-cache/sci-chemistry/dssp-4.2.0
deleted file mode 100644
index 3daa1bdec351..000000000000
--- a/metadata/md5-cache/sci-chemistry/dssp-4.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/boost:=[zlib] >=dev-libs/libmcfp-1.2.2 >=sci-libs/libcifpp-5.0.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=The protein secondary structure standard
-EAPI=8
-HOMEPAGE=https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp
-INHERIT=cmake
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/boost:=[zlib] >=dev-libs/libmcfp-1.2.2 >=sci-libs/libcifpp-5.0.4
-SLOT=0
-SRC_URI=https://github.com/PDB-REDO/dssp/archive/refs/tags/v4.2.0.tar.gz -> dssp-4.2.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2559f76b0e5bd728e50242e17b405bd8
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 0b53670ea9c4..fccd19065076 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-6.0.11
new file mode 100644
index 000000000000..8f14b9bf2a33
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-6.0.11
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/swig-3.0 doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=dev-libs/boost:=[context,nls] <dev-python/wxpython-4.2.0 media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=8
+HOMEPAGE=https://www.kicad.org
+INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+IUSE=doc examples ngspice nls openmp +occ +pcm +python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
+RDEPEND=dev-libs/boost:=[context,nls] <dev-python/wxpython-4.2.0 media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= ) sci-electronics/electronics-menu
+REQUIRED_USE=^^ ( python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/6.0.11/kicad-6.0.11.tar.bz2
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a5aa59304c12742a189c63b51d3c3388
diff --git a/metadata/md5-cache/sci-electronics/kicad-6.0.9 b/metadata/md5-cache/sci-electronics/kicad-6.0.9
deleted file mode 100644
index f1db5395b6c8..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-6.0.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/swig-3.0 doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=!sci-electronics/kicad-i18n dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] dev-python/wxpython:4.0[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= )
-DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=8
-HOMEPAGE=https://www.kicad.org
-INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
-IUSE=doc examples ngspice nls openmp +occ +pcm python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
-RDEPEND=!sci-electronics/kicad-i18n dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] dev-python/wxpython:4.0[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= ) sci-electronics/electronics-menu
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/6.0.9/kicad-6.0.9.tar.gz -> kicad-6.0.9.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2e2fa44dbce4ca71589b07e28e51d83f
diff --git a/metadata/md5-cache/sci-electronics/kicad-6.0.9-r1 b/metadata/md5-cache/sci-electronics/kicad-6.0.9-r1
new file mode 100644
index 000000000000..b6244d2af444
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-6.0.9-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/swig-3.0 doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=!sci-electronics/kicad-i18n dev-libs/boost:=[context,nls] <dev-python/wxpython-4.2.0 media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=8
+HOMEPAGE=https://www.kicad.org
+INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+IUSE=doc examples ngspice nls openmp +occ +pcm +python_single_target_python3_9
+KEYWORDS=amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
+RDEPEND=!sci-electronics/kicad-i18n dev-libs/boost:=[context,nls] <dev-python/wxpython-4.2.0 media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) occ? ( >=sci-libs/opencascade-7.3.0:0= ) sci-electronics/electronics-menu
+REQUIRED_USE=^^ ( python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/6.0.9/kicad-6.0.9.tar.bz2
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9259e8ed52184a6d7526ebc6960b7ae5
diff --git a/metadata/md5-cache/sci-electronics/kicad-7.0.1 b/metadata/md5-cache/sci-electronics/kicad-7.0.1
new file mode 100644
index 000000000000..d18c9e82c398
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-7.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/swig-4.0 doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=8
+HOMEPAGE=https://www.kicad.org
+INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+IUSE=doc examples +ngspice nls openmp python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) sci-electronics/electronics-menu
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/7.0.1/kicad-7.0.1.tar.bz2 -> kicad-7.0.1.tar.bz2
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=42713eebbf7d72b4a413a400cec95420
diff --git a/metadata/md5-cache/sci-electronics/kicad-9999 b/metadata/md5-cache/sci-electronics/kicad-9999
index f7be1e6131e5..4c18ad1b7905 100644
--- a/metadata/md5-cache/sci-electronics/kicad-9999
+++ b/metadata/md5-cache/sci-electronics/kicad-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-lang/swig-4.0 doc? ( app-doc/doxygen ) >=x11-misc/util-macros-1.18 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext )
+DEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=8
 HOMEPAGE=https://www.kicad.org
 INHERIT=check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils git-r3
-IUSE=doc examples +ngspice nls openmp python_single_target_python3_9 python_single_target_python3_10
+IUSE=doc examples +ngspice nls openmp python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2+ GPL-3+ Boost-1.0 BSD
 PROPERTIES=live
-RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) sci-electronics/electronics-menu
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=dev-db/unixODBC dev-libs/boost:=[context,nls] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] net-misc/curl >=sci-libs/opencascade-7.3.0:0= >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.2-gtk3[X,opengl] sys-libs/zlib python_single_target_python3_9? ( dev-libs/boost:=[context,nls,python,python_targets_python3_9(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[context,nls,python,python_targets_python3_10(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-libs/boost:=[context,nls,python,python_targets_python3_11(-)] ~dev-python/wxpython-4.2.0:*[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ngspice? ( >sci-electronics/ngspice-27[shared] ) nls? ( sys-devel/gettext ) sci-electronics/electronics-menu
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c21a46106ef912828f2659df77a68c79
+_md5_=42713eebbf7d72b4a413a400cec95420
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-footprints-6.0.11
new file mode 100644
index 000000000000..d8fd8fe57be5
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-6.0.11
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-footprints
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-6.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/6.0.11/kicad-footprints-6.0.11.tar.bz2 -> kicad-footprints-6.0.11.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f2621d3e47217d9f14f95365c4e4ad17
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.1 b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.1
new file mode 100644
index 000000000000..ab56dc7e5e9f
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-7.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools footprint libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-footprints
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-7.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-footprints/-/archive/7.0.1/kicad-footprints-7.0.1.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=152785b97e9e6d7aec8becf6fe9025d4
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-meta-6.0.11
new file mode 100644
index 000000000000..94f2ef80a415
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-6.0.11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=8
+HOMEPAGE=http://www.kicad.org
+IUSE=doc minimal
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-6.0.11 >=sci-electronics/kicad-symbols-6.0.11 >=sci-electronics/kicad-footprints-6.0.11 doc? ( >=app-doc/kicad-doc-6.0.11 ) !minimal? ( >=sci-electronics/kicad-packages3d-6.0.11 >=sci-electronics/kicad-templates-6.0.11 )
+SLOT=0
+_md5_=b1b36d74820407e1ff86803ae04506c1
diff --git a/metadata/md5-cache/sci-electronics/kicad-meta-7.0.1 b/metadata/md5-cache/sci-electronics/kicad-meta-7.0.1
new file mode 100644
index 000000000000..d5cca232fe2b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-meta-7.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Electronic Schematic and PCB design tools (meta package)
+EAPI=8
+HOMEPAGE=http://www.kicad.org
+IUSE=doc minimal
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=metapackage
+RDEPEND=>=sci-electronics/kicad-7.0.1 >=sci-electronics/kicad-symbols-7.0.1 >=sci-electronics/kicad-footprints-7.0.1 doc? ( >=app-doc/kicad-doc-7.0.1 ) !minimal? ( >=sci-electronics/kicad-packages3d-7.0.1 >=sci-electronics/kicad-templates-7.0.1 )
+SLOT=0
+_md5_=29e2e7076352a3aa4980710ce512c409
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.11
new file mode 100644
index 000000000000..d90ff9cc49e3
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.11
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-packages3D
+INHERIT=check-reqs cmake
+IUSE=+occ
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-6.0.0[occ=]
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/6.0.11/kicad-packages3D-6.0.11.tar.bz2 -> kicad-packages3d-6.0.11.tar.bz2
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4a5410945fd6ecf4473d4810f8dab385
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.1 b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.1
new file mode 100644
index 000000000000..10e1510ae574
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Electronic Schematic and PCB design tools 3D package libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-packages3D
+INHERIT=check-reqs cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-7.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/7.0.1/kicad-packages3D-7.0.1.tar.bz2 -> kicad-packages3d-7.0.1.tar.bz2
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ae356807f63c6e8e3081ae52d7bbc29d
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-symbols-6.0.11
new file mode 100644
index 000000000000..377c6ea76972
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-6.0.11
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-symbols
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-6.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/6.0.11/kicad-symbols-6.0.11.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c873e7bddd87177aad6470f69d52c5df
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.1 b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.1
new file mode 100644
index 000000000000..d229160d0e9a
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-7.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools symbol libraries
+EAPI=8
+HOMEPAGE=https://gitlab.com/kicad/libraries/kicad-symbols
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-7.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-symbols/-/archive/7.0.1/kicad-symbols-7.0.1.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=bab79a631f2c0b7594d88f8cb58ddada
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-6.0.11 b/metadata/md5-cache/sci-electronics/kicad-templates-6.0.11
new file mode 100644
index 000000000000..9483bb935cb1
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-6.0.11
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
+EAPI=8
+HOMEPAGE=https://github.com/kicad/kicad-templates
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-6.0.0
+SLOT=0
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/6.0.11/kicad-templates-6.0.11.tar.bz2
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=844961ed7335227a4649299c65edf82c
diff --git a/metadata/md5-cache/dev-cpp/json11-1.0.0 b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.1
similarity index 56%
rename from metadata/md5-cache/dev-cpp/json11-1.0.0
rename to metadata/md5-cache/sci-electronics/kicad-templates-7.0.1
index 5b7030bb531b..9fe219adb16c 100644
--- a/metadata/md5-cache/dev-cpp/json11-1.0.0
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-7.0.1
@@ -1,12 +1,13 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tiny JSON library for C++11
+DESCRIPTION=Electronic Schematic and PCB design tools project templates
 EAPI=8
-HOMEPAGE=https://github.com/dropbox/json11
+HOMEPAGE=https://github.com/kicad/kicad-templates
 INHERIT=cmake
-KEYWORDS=amd64 x86
-LICENSE=MIT
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=CC-BY-SA-4.0
+RDEPEND=>=sci-electronics/kicad-7.0.0
 SLOT=0
-SRC_URI=https://github.com/dropbox/json11/archive/refs/tags/v1.0.0.tar.gz -> json11-1.0.0.tar.gz
+SRC_URI=https://gitlab.com/kicad/libraries/kicad-templates/-/archive/7.0.1/kicad-templates-7.0.1.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f97719641acefa411825f6b89b705a8f
+_md5_=1bed559adb1a0c2f3379bf573fffabcd
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 96e8721cc372..13ffa3c577e9 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.25 b/metadata/md5-cache/sci-geosciences/gpsd-3.25
index c52867083c73..24689469eb7f 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.25
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.25
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gpsd.gitlab.io/gpsd/
 INHERIT=distutils-r1 scons-utils systemd toolchain-funcs udev
 IUSE=+gpsd_protocols_aivdm +gpsd_protocols_ashtech +gpsd_protocols_earthmate +gpsd_protocols_evermore +gpsd_protocols_fury +gpsd_protocols_fv18 +gpsd_protocols_garmin +gpsd_protocols_garmintxt +gpsd_protocols_geostar +gpsd_protocols_gpsclock +gpsd_protocols_greis +gpsd_protocols_isync +gpsd_protocols_itrax +gpsd_protocols_navcom +gpsd_protocols_nmea2000 +gpsd_protocols_oceanserver +gpsd_protocols_oncore +gpsd_protocols_rtcm104v2 +gpsd_protocols_rtcm104v3 +gpsd_protocols_sirf +gpsd_protocols_skytraq +gpsd_protocols_superstar2 +gpsd_protocols_tnt +gpsd_protocols_tripmate +gpsd_protocols_tsip +gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 +shm +sockets static systemd test udev usb X python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez:= ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) qt5? ( cxx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/30
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.25.tar.xz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=26a33fc7c285d25c9531be8cbf071e78
+_md5_=1819b410c8b36d18d344c84c37ac9701
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4 b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
index a083797a5335..470d3e469b6a 100644
--- a/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
+++ b/metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://routino.org/
 INHERIT=toolchain-funcs distutils-r1
 IUSE=python test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=AGPL-3+
 RDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://routino.org/download/routino-3.3.3.tgz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5fe390bca2eb4bd95a8d4d45a267d946
+_md5_=f3b890d433e2692341305ad0ae15d83f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b04c43582b6c..1d4e52d3b5e1 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/cgnslib-4.3.0 b/metadata/md5-cache/sci-libs/cgnslib-4.3.0-r1
similarity index 72%
rename from metadata/md5-cache/sci-libs/cgnslib-4.3.0
rename to metadata/md5-cache/sci-libs/cgnslib-4.3.0-r1
index 7fe425cfcd22..02bc2910ba1c 100644
--- a/metadata/md5-cache/sci-libs/cgnslib-4.3.0
+++ b/metadata/md5-cache/sci-libs/cgnslib-4.3.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+DEPEND=hdf5? ( <sci-libs/hdf5-1.14.0:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
 DESCRIPTION=CFD General Notation System standard library
 EAPI=8
 HOMEPAGE=https://cgns.github.io/ https://github.com/CGNS/CGNS
@@ -8,10 +8,10 @@ INHERIT=cmake fortran-2
 IUSE=base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools
 KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
-RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+RDEPEND=hdf5? ( <sci-libs/hdf5-1.14.0:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
 REQUIRED_USE=mpi? ( hdf5 ) szip? ( hdf5 )
 RESTRICT=fortran? ( test ) !test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/CGNS/CGNS/archive/v4.3.0.tar.gz -> cgnslib-4.3.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=78ea9c6ef9eac24d92a268f2feeaaea7
+_md5_=a4b203acd54ef64ef234a120b2d62787
diff --git a/metadata/md5-cache/sci-libs/ignition-math-6.10.0 b/metadata/md5-cache/sci-libs/ignition-math-6.14.0
similarity index 93%
rename from metadata/md5-cache/sci-libs/ignition-math-6.10.0
rename to metadata/md5-cache/sci-libs/ignition-math-6.14.0
index 2c561658c251..4a26159012ad 100644
--- a/metadata/md5-cache/sci-libs/ignition-math-6.10.0
+++ b/metadata/md5-cache/sci-libs/ignition-math-6.14.0
@@ -8,6 +8,6 @@ INHERIT=cmake vcs-snapshot
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=6/6
-SRC_URI=https://github.com/ignitionrobotics/ign-math/archive/ignition-math6_6.10.0.tar.gz
+SRC_URI=https://github.com/ignitionrobotics/ign-math/archive/ignition-math6_6.14.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=673202b7752e25a8a874701e2eb6d822
+_md5_=8bd599ea1bc0c8dc48d80dd9dcf506a1
diff --git a/metadata/md5-cache/sci-libs/med-4.1.1 b/metadata/md5-cache/sci-libs/med-4.1.1-r1
similarity index 76%
rename from metadata/md5-cache/sci-libs/med-4.1.1
rename to metadata/md5-cache/sci-libs/med-4.1.1-r1
index 18b22cb889d9..6876669f31a5 100644
--- a/metadata/md5-cache/sci-libs/med-4.1.1
+++ b/metadata/md5-cache/sci-libs/med-4.1.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=python? ( >=dev-lang/swig-3.0.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) fortran? ( virtual/fortran )
+DEPEND=!sci-libs/libmed dev-lang/tk:0= <sci-libs/hdf5-1.14.0:=[fortran?,mpi(+)?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) fortran? ( virtual/fortran )
 DESCRIPTION=A library to store and exchange meshed data or computation results
 EAPI=8
 HOMEPAGE=https://www.salome-platform.org/user-section/about/med
@@ -8,10 +8,10 @@ INHERIT=cmake flag-o-matic fortran-2 python-single-r1
 IUSE=doc fortran mpi python test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) fortran? ( virtual/fortran )
+RDEPEND=!sci-libs/libmed dev-lang/tk:0= <sci-libs/hdf5-1.14.0:=[fortran?,mpi(+)?] mpi? ( virtual/mpi[fortran?] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) fortran? ( virtual/fortran )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test ) python? ( test )
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.1.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9e1fab4a59f0ec07ddd71fdbcb361d45
+_md5_=b06311f17b90dd57ddc97265d5cbc73a
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index aa2f5315d462..77e22527be45 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1 b/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
deleted file mode 100644
index 0a1175607cd2..000000000000
--- a/metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pybind11[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pybind11[python_targets_python3_11(-)] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_9? ( dev-python/gmpy:2[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/sympy[python_targets_python3_9(-)] jupyter? ( dev-python/jupyter[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gtk? ( dev-cpp/gtkmm:3.0 )
-DESCRIPTION=Field-theory motivated approach to computer algebra
-EAPI=8
-HOMEPAGE=https://cadabra.science/
-INHERIT=xdg-utils python-single-r1 cmake
-IUSE=gtk +jupyter test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/dvipng dev-cpp/glibmm:2 dev-db/sqlite:3= dev-libs/boost:= dev-libs/gmp:=[cxx] dev-libs/jsoncpp:= dev-libs/libsigc++:2 dev-texlive/texlive-basic python_single_target_python3_9? ( dev-python/gmpy:2[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/sympy[python_targets_python3_9(-)] jupyter? ( dev-python/jupyter[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/gmpy:2[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/sympy[python_targets_python3_10(-)] jupyter? ( dev-python/jupyter[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/gmpy:2[python_targets_python3_11(-)] dev-python/matplotlib[python_targets_python3_11(-)] dev-python/sympy[python_targets_python3_11(-)] jupyter? ( dev-python/jupyter[python_targets_python3_11(-)] ) ) gtk? ( dev-cpp/gtkmm:3.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/kpeeters/cadabra2/archive/2.4.2.1.tar.gz -> cadabra-2.4.2.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b60bac52009a77570cf7b9d7020e3cf6
diff --git a/metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4 b/metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4
index ecc038b721d1..87539bf30f06 100644
--- a/metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4
+++ b/metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/5.11.4
 SRC_URI=https://github.com/msoos/cryptominisat/archive/5.11.4.tar.gz -> cryptominisat-5.11.4.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aa164f4b19a9d1190f0aa284fc68008e
+_md5_=cfc6545e4738f3b9c0a3a77e9efeb2e8
diff --git a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0 b/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
deleted file mode 100644
index dea1ede5314f..000000000000
--- a/metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) )
-DESCRIPTION=Advanced SAT solver with C++ and Python interfaces
-EAPI=8
-HOMEPAGE=https://github.com/msoos/cryptominisat/
-INHERIT=python-single-r1 cmake
-IUSE=+python python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MIT
-RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 ) )
-RESTRICT=test
-SLOT=0/5.8.0
-SRC_URI=https://github.com/msoos/cryptominisat/archive/5.8.0.tar.gz -> cryptominisat-5.8.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=624cfe2abfd6cfc30a583ab0bc97dfea
diff --git a/metadata/md5-cache/sci-mathematics/ginac-1.8.6 b/metadata/md5-cache/sci-mathematics/ginac-1.8.6
index fb096351abe3..e42fabe5a433 100644
--- a/metadata/md5-cache/sci-mathematics/ginac-1.8.6
+++ b/metadata/md5-cache/sci-mathematics/ginac-1.8.6
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.ginac.de/
 INHERIT=python-any-r1
 IUSE=doc examples
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=sci-libs/cln-1.2.2
 SLOT=0
 SRC_URI=http://www.ginac.de/ginac-1.8.6.tar.bz2
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=51e238ebdd3a0d143e318881797acadd
+_md5_=ef05e7a5bacdc7c3765cf0667d8c9566
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.50.1 b/metadata/md5-cache/sci-mathematics/lean-3.50.1
deleted file mode 100644
index 8a9c8f44b06d..000000000000
--- a/metadata/md5-cache/sci-mathematics/lean-3.50.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:=
-DESCRIPTION=The Lean Theorem Prover
-EAPI=8
-HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=flag-o-matic cmake readme.gentoo-r1
-IUSE=debug +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/gmp:=
-SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.50.1.tar.gz -> lean-3.50.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a0acb3193721cd936e6ac59b20e20bd
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.50.2 b/metadata/md5-cache/sci-mathematics/lean-3.50.2
deleted file mode 100644
index dde8eaa758c0..000000000000
--- a/metadata/md5-cache/sci-mathematics/lean-3.50.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/gmp:=
-DESCRIPTION=The Lean Theorem Prover
-EAPI=8
-HOMEPAGE=https://leanprover-community.github.io/
-INHERIT=flag-o-matic cmake readme.gentoo-r1
-IUSE=debug +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/gmp:=
-SLOT=0/3
-SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.50.2.tar.gz -> lean-3.50.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a0acb3193721cd936e6ac59b20e20bd
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.50.3 b/metadata/md5-cache/sci-mathematics/lean-3.50.3
index cd4f5053f62c..4c6b822eb2b9 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.50.3
+++ b/metadata/md5-cache/sci-mathematics/lean-3.50.3
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 SRC_URI=https://github.com/leanprover-community/lean/archive/refs/tags/v3.50.3.tar.gz -> lean-3.50.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a0acb3193721cd936e6ac59b20e20bd
+_md5_=174ea6327605b316c0ac7e5d08433616
diff --git a/metadata/md5-cache/sci-mathematics/lean-3.9999 b/metadata/md5-cache/sci-mathematics/lean-3.9999
index ed8fd96f4e8e..b5db78f3c6b0 100644
--- a/metadata/md5-cache/sci-mathematics/lean-3.9999
+++ b/metadata/md5-cache/sci-mathematics/lean-3.9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/gmp:=
 SLOT=0/3
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=979d60fcec742724540b851215bf31f7
+_md5_=174ea6327605b316c0ac7e5d08433616
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1 b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
index e112335997fb..538a8320cd66 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://maxima.sourceforge.net/
 INHERIT=autotools elisp-common flag-o-matic python-single-r1 xdg-utils
 IUSE=clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test l10n_de l10n_es l10n_pt l10n_pt-BR python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
 RDEPEND=clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) clozurecl64? ( dev-lisp/clozurecl app-misc/rlwrap ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( <dev-lisp/gcl-2.6.14[ansi,readline] ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) virtual/libcrypt:= emacs? ( >=app-editors/emacs-26:* ) gui? ( dev-lang/tk:0 ) X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] vtk? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) sci-libs/vtk[python,rendering,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] ) ) emacs? ( virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended )
 REQUIRED_USE=vtk? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) || ( clisp clozurecl clozurecl64 cmucl ecls gcl sbcl ) gui? ( X )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.46.0.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	dcd21c5d379fc2217e95f529504c5fe0	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=01f2246376b0276971d939eaf4fb53de
+_md5_=6c8e458eaab9b79adac7dcee2a863f19
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 8c44bb692d09..0b03bc5bdb0e 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.9.0-r1 b/metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
index e4164bad07fe..9c112478da99 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
+++ b/metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.9.0/labplot-2.9.0.tar.xz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	ecm	15862358f80ef4da6fd9d7dde64e9148	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	kde.org	dc60243572471279b11120514b85b558	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7c8754a1d7631284f6bd135a11b94ad6
+_md5_=a6be72086c6eaf1f430f3331cb48b2da
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index a839412d3f7c..000cfaa85d52 100644
Binary files a/metadata/md5-cache/sec-keys/Manifest.gz and b/metadata/md5-cache/sec-keys/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
similarity index 64%
rename from metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
rename to metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
index 59a54d33026d..a241cc97ce4e 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
@@ -4,6 +4,6 @@ EAPI=8
 HOMEPAGE=https://tomcat.apache.org/download-90.cgi
 KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=public-domain
-SLOT=10.1.5
-SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/KEYS -> openpgp-keys-apache-tomcat-10.1.5-KEYS.asc
+SLOT=10.1.8
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.8/KEYS -> openpgp-keys-apache-tomcat-10.1.8-KEYS.asc
 _md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88
new file mode 100644
index 000000000000..da53724d0cda
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.88
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.88/KEYS -> openpgp-keys-apache-tomcat-8.5.88-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.74 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.74
new file mode 100644
index 000000000000..efee2d68547b
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.74
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=9.0.74
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.74/KEYS -> openpgp-keys-apache-tomcat-9.0.74-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index aa335f618ac7..e61563f6a1a5 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.2-r1 b/metadata/md5-cache/sys-apps/coreutils-9.2-r1
deleted file mode 100644
index c5ed29a6a0f9..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-9.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) openssl? ( dev-libs/openssl:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
-IUSE=acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-9.2.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.2.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=4d2ab24bf7be570977a8d7d95213b5a8
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.2_p20230410 b/metadata/md5-cache/sys-apps/coreutils-9.2_p20230410
deleted file mode 100644
index c8766c7794a2..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-9.2_p20230410
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) openssl? ( dev-libs/openssl:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
-IUSE=acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr verify-sig
-LICENSE=GPL-3+
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.pixelbeat.org/cu/coreutils-9.2.18-ffd62.tar.xz -> coreutils-9.2_p20230410.tar.xz verify-sig? ( https://www.pixelbeat.org/cu/coreutils-9.2.18-ffd62.tar.xz.sig -> coreutils-9.2_p20230410.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=8ef7b8bc7e056658bab9776ae48e062a
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.2 b/metadata/md5-cache/sys-apps/coreutils-9.3
similarity index 92%
rename from metadata/md5-cache/sys-apps/coreutils-9.2
rename to metadata/md5-cache/sys-apps/coreutils-9.3
index 38f12ae267dc..ad73e1a3d624 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.2
+++ b/metadata/md5-cache/sys-apps/coreutils-9.3
@@ -11,6 +11,6 @@ LICENSE=GPL-3+
 RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) openssl? ( dev-libs/openssl:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-9.2.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.2.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
+SRC_URI=mirror://gnu/coreutils/coreutils-9.3.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.3.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=fdf5c87e04083ad16b135a75d709a04b
+_md5_=e62cf33f1a3df0de07b04d05d4e4777a
diff --git a/metadata/md5-cache/sys-apps/coreutils-9999 b/metadata/md5-cache/sys-apps/coreutils-9999
index 26ebb69dd05a..d6b647991e1e 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9999
+++ b/metadata/md5-cache/sys-apps/coreutils-9999
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=!vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=fdf5c87e04083ad16b135a75d709a04b
+_md5_=eb0225ab3ecada1a3a047add0d95fb1b
diff --git a/metadata/md5-cache/sys-apps/cracklib-words-2.9.10 b/metadata/md5-cache/sys-apps/cracklib-words-2.9.10
index 67c465413ea7..c5d4fa6c202e 100644
--- a/metadata/md5-cache/sys-apps/cracklib-words-2.9.10
+++ b/metadata/md5-cache/sys-apps/cracklib-words-2.9.10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Large set of crack/cracklib dictionaries
 EAPI=8
 HOMEPAGE=https://github.com/cracklib/cracklib/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.10/cracklib-words-2.9.10.gz
-_md5_=bfd4dcd640f4a61c0e77c0f6a5c932ee
+_md5_=639e65d968b57c732b823180f85d2b35
diff --git a/metadata/md5-cache/sys-apps/firejail-0.9.72 b/metadata/md5-cache/sys-apps/firejail-0.9.72
index be919a713502..f59eda1f9b8d 100644
--- a/metadata/md5-cache/sys-apps/firejail-0.9.72
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.72
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://firejail.wordpress.com/
 INHERIT=toolchain-funcs python-single-r1 linux-info
 IUSE=apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home selinux test +userns X python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) contrib? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) dbusproxy? ( sys-apps/xdg-dbus-proxy ) selinux? ( sys-libs/libselinux )
 REQUIRED_USE=contrib? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netblue30/firejail/releases/download/0.9.72/firejail-0.9.72.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=40f62a2b45e3b596e0c64a4fbc9bb04e
+_md5_=dbbf519e43b0fd1cc999367afbd1a759
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.12.8 b/metadata/md5-cache/sys-apps/flatpak-1.12.8
index 49e284ede91d..0fa7c66d7c8e 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.12.8
+++ b/metadata/md5-cache/sys-apps/flatpak-1.12.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://flatpak.org/
 INHERIT=linux-info python-any-r1
 IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/xdg-desktop-portal
 RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] || ( dev-util/ostree[curl] dev-util/ostree[soup] ) >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.4:2.4= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.12.8/flatpak-1.12.8.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=bb326fc41ad9381d69ae59c9fbf6da1b
+_md5_=99fbd60bf84c0f797da566f4a6cbe33c
diff --git a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1 b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
index 9a1ff7956726..1ef910ec94f5 100644
--- a/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
+++ b/metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://flatpak.org/
 INHERIT=linux-info python-any-r1 systemd
 IUSE=doc introspection policykit seccomp systemd X
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/xdg-desktop-portal
 RDEPEND=acct-group/flatpak acct-user/flatpak >=app-arch/libarchive-2.8:= app-arch/zstd:= >=app-crypt/gpgme-1.1.8:= >=dev-libs/appstream-0.12:= >=dev-libs/appstream-glib-0.5.10:= >=dev-libs/glib-2.56:2= >=dev-libs/libxml2-2.4:= dev-libs/json-glib:= dev-libs/libassuan:= >=dev-util/ostree-2020.8:=[gpg(+)] dev-util/ostree[curl] >=gnome-base/dconf-0.26:= gnome-base/gsettings-desktop-schemas net-misc/curl:= >=sys-apps/bubblewrap-0.5.0 sys-apps/dbus >=sys-fs/fuse-2.9.9:0= sys-apps/xdg-dbus-proxy X? ( x11-apps/xauth x11-libs/libXau:= ) x11-libs/gdk-pixbuf:2= policykit? ( >=sys-auth/polkit-0.98:= ) seccomp? ( sys-libs/libseccomp:= ) systemd? ( sys-apps/systemd:= )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flatpak/flatpak/releases/download/1.14.4/flatpak-1.14.4.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=7b5082fd40cd779145a2ae60137f0ac6
+_md5_=5867953dca5546cb9ca225a059926a5b
diff --git a/metadata/md5-cache/sys-apps/openrc-0.47 b/metadata/md5-cache/sys-apps/openrc-0.47.1
similarity index 95%
rename from metadata/md5-cache/sys-apps/openrc-0.47
rename to metadata/md5-cache/sys-apps/openrc-0.47.1
index b3ed68660f6e..5c32345f7661 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.47
+++ b/metadata/md5-cache/sys-apps/openrc-0.47.1
@@ -11,6 +11,6 @@ LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) !prefix? ( sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( || ( >=sys-apps/sysvinit-2.86-r6[selinux?] sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
-SRC_URI=https://github.com/OpenRC/openrc/archive/0.47.tar.gz -> openrc-0.47.tar.gz
+SRC_URI=https://github.com/OpenRC/openrc/archive/0.47.1.tar.gz -> openrc-0.47.1.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pam	4efe951aa8ce2c16288d7c915196fe29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=846a10fdfe3212e767cc57cba89eb139
diff --git a/metadata/md5-cache/sys-apps/shadow-4.13-r3 b/metadata/md5-cache/sys-apps/shadow-4.13-r3
new file mode 100644
index 000000000000..683b10e3a841
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/shadow-4.13-r3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-devel/gettext verify-sig? ( sec-keys/openpgp-keys-sergehallyn ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install postinst preinst prepare unpack
+DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) >=sys-kernel/linux-headers-4.14
+DESCRIPTION=Utilities to deal with user accounts
+EAPI=8
+HOMEPAGE=https://github.com/shadow-maint/shadow
+INHERIT=libtool pam verify-sig
+IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr verify-sig
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20180315-r1 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
+REQUIRED_USE=?? ( cracklib pam )
+SLOT=0/4
+SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/4.13/shadow-4.13.tar.xz.asc )
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pam	4efe951aa8ce2c16288d7c915196fe29	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=52751527d620c83aa2da673aa7d1a483
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.39_rc3 b/metadata/md5-cache/sys-apps/util-linux-2.39_rc3
new file mode 100644
index 000000000000..125319933019
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.39_rc3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) verify-sig? ( sec-keys/openpgp-keys-karelzak ) >=app-portage/elt-patches-20170815 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers acct-group/root
+DESCRIPTION=Various useful Linux utilities
+EAPI=8
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux
+INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd verify-sig
+IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) su? ( pam )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39-rc3.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39-rc3.tar.sign )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	4efe951aa8ce2c16288d7c915196fe29	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=b75903a0205771a0383eeabd5be4e1e2
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.2 b/metadata/md5-cache/sys-auth/AusweisApp2-1.26.2
deleted file mode 100644
index fb01f057c442..000000000000
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-DESCRIPTION=Official authentication app for German ID cards and residence permits
-EAPI=8
-HOMEPAGE=https://www.ausweisapp.bund.de/
-INHERIT=cmake xdg-utils
-KEYWORDS=amd64 x86
-LICENSE=EUPL-1.2
-RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
-SLOT=0
-SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.26.2.tar.gz -> AusweisApp2-1.26.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c5fb0998d53409859caa7bdd1f7b1a98
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.3 b/metadata/md5-cache/sys-auth/AusweisApp2-1.26.3
index daa655671c3c..e49517bbfb0a 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.26.3
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.26.3
@@ -5,10 +5,10 @@ DESCRIPTION=Official authentication app for German ID cards and residence permit
 EAPI=8
 HOMEPAGE=https://www.ausweisapp.bund.de/
 INHERIT=cmake xdg-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.26.3.tar.gz -> AusweisApp2-1.26.3.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=354c531cfa11fd3c92d1b8a0982e92e0
+_md5_=c5fb0998d53409859caa7bdd1f7b1a98
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 39c4eec8e6c6..3227e0a75033 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/skey-1.1.5-r13 b/metadata/md5-cache/sys-auth/skey-1.1.5-r13
deleted file mode 100644
index 53c247ff124c..000000000000
--- a/metadata/md5-cache/sys-auth/skey-1.1.5-r13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-lang/perl sys-libs/cracklib virtual/libcrypt:=
-DESCRIPTION=Linux Port of OpenBSD Single-key Password System
-EAPI=8
-HOMEPAGE=https://web.archive.org/web/20160710152027/http://www.openbsd.org:80/faq/faq8.html#SKey
-INHERIT=autotools readme.gentoo-r1 toolchain-funcs usr-ldscript
-IUSE=static-libs split-usr
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD MIT RSA BEER-WARE
-RDEPEND=dev-lang/perl sys-libs/cracklib virtual/libcrypt:= virtual/perl-Time-Local
-SLOT=0
-SRC_URI=mirror://gentoo/skey-1.1.5.tar.bz2 https://dev.gentoo.org/~ulm/distfiles/skey-1.1.5-patches-6.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=a17cdb4e284a2c117976db8f5fef291c
diff --git a/metadata/md5-cache/sys-auth/skey-1.1.5-r14 b/metadata/md5-cache/sys-auth/skey-1.1.5-r14
index c0ed57707099..e5810afffe9e 100644
--- a/metadata/md5-cache/sys-auth/skey-1.1.5-r14
+++ b/metadata/md5-cache/sys-auth/skey-1.1.5-r14
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://web.archive.org/web/20160710152027/http://www.openbsd.org:80/faq/faq8.html#SKey
 INHERIT=autotools readme.gentoo-r1 toolchain-funcs usr-ldscript
 IUSE=static-libs split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD MIT RSA BEER-WARE
 RDEPEND=dev-lang/perl sys-libs/cracklib virtual/libcrypt:= virtual/perl-Time-Local
 SLOT=0
 SRC_URI=mirror://gentoo/skey-1.1.5.tar.bz2 https://dev.gentoo.org/~ulm/distfiles/skey-1.1.5-patches-7.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=5bba4f42e211fab21f393dd3975988d3
+_md5_=0f93a483c85bc5a731565e7f8661ea49
diff --git a/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1 b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
index c8a9448a68f6..51e44652bea0 100644
--- a/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
+++ b/metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/ssh-import-id
 INHERIT=distutils-r1
 IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-python/distro[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://launchpad.net/ssh-import-id/trunk/5.11/+download/ssh-import-id-5.11.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=166075949d17956338f61be112d096b6
+_md5_=fa1aaa3a2cfd8f387aeff0d2ada8a651
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 88dac991bf72..75ba9a2cfe46 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index 2fdc3ac6ba99..5a9abb8f0ebf 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=86c93692eb7f156cf22a7a103b6e1bea
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index f5adecad647a..8cb8504f2c7d 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b69921e3360c0c617082db23bde2927a
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.1 b/metadata/md5-cache/sys-devel/clang-16.0.1
index 1ea349d27c84..ecee90c02e3d 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.1
+++ b/metadata/md5-cache/sys-devel/clang-16.0.1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.1-manpages.tar.bz2 )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=405b881a42872da962e7accb1d97fb55
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.2 b/metadata/md5-cache/sys-devel/clang-16.0.2
new file mode 100644
index 000000000000..14069a4eaed7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-16.0.2
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.2:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
+IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=~sys-devel/clang-runtime-16.0.2 sys-devel/clang-toolchain-symlinks:16
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.2:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-16.0.2 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2[llvm_targets_Xtensa] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.2-manpages.tar.bz2 )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ce313cda79e8a52cb3fa776cdd29bd63
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.2.9999 b/metadata/md5-cache/sys-devel/clang-16.0.3.9999
similarity index 55%
rename from metadata/md5-cache/sys-devel/clang-16.0.2.9999
rename to metadata/md5-cache/sys-devel/clang-16.0.3.9999
index d7ef9af5e50c..4bf60a3a72ea 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/clang-16.0.3.9999
@@ -1,17 +1,17 @@
 BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.2.9999:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-16.0.3.9999:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
 DESCRIPTION=C language family frontend for LLVM
 EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
 IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-16.0.2.9999 sys-devel/clang-toolchain-symlinks:16
+PDEPEND=~sys-devel/clang-runtime-16.0.3.9999 sys-devel/clang-toolchain-symlinks:16
 PROPERTIES=live
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.2.9999:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-16.0.2.9999 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.2.9999[llvm_targets_Xtensa] )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ~sys-devel/llvm-16.0.3.9999:16=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-16.0.3.9999 llvm_targets_AArch64? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-16.0.3.9999[llvm_targets_Xtensa] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=26c367d242e54669c25aac28cede3165
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=50e1f423a58555d82e0da7b911db4900
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
index 8c1a74c6c5a0..3b482fdb6dae 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) pyth
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4e56ae753b552c3cb0a081183f057465
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325
index c4e646cf157e..aad9651339b4 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b0e5d9f135423dd030004fedbd759e39
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414
index 6cd1a3f5b44b..63c0e747d5c0 100644
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=4e56ae753b552c3cb0a081183f057465
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index ed3fbe28b251..4a9f6d77cfaf 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
index 0dedd647fb1d..a313b099dcec 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=9d88a62b4082774b870bb8a60799139d
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.1 b/metadata/md5-cache/sys-devel/clang-common-16.0.1
index 5c2f28d3557b..21b644f9041d 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.1 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=fbe67c5003dabfb1f92b8b52cb06dfa1
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.2 b/metadata/md5-cache/sys-devel/clang-common-16.0.2
new file mode 100644
index 000000000000..b4cc98673db5
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.2
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install preinst prepare pretend unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
+INHERIT=bash-completion-r1 llvm.org
+IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.2 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=fbe67c5003dabfb1f92b8b52cb06dfa1
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.2.9999 b/metadata/md5-cache/sys-devel/clang-common-16.0.3.9999
similarity index 83%
rename from metadata/md5-cache/sys-devel/clang-common-16.0.2.9999
rename to metadata/md5-cache/sys-devel/clang-common-16.0.3.9999
index 5c760cbdd575..b93b1dceeae4 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.3.9999
@@ -7,8 +7,8 @@ IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-de
 INHERIT=bash-completion-r1 llvm.org
 IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.2.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
+PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.3.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=69b19d0ac996b5437b2436430496b71e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
index ad102febb201..2db5e7673204 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0.9999 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 PROPERTIES=live
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=69b19d0ac996b5437b2436430496b71e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325
index 245c1607a95c..ea58623ff0af 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230325 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=69b19d0ac996b5437b2436430496b71e
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414
index 51a09ba33d03..56ed1a5e973c 100644
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230414 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=69b19d0ac996b5437b2436430496b71e
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.2 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.2
new file mode 100644
index 000000000000..c53dcb722717
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=pretend
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build toolchain-funcs
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.2:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.2:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=16
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=26ee675f9dafad522d218d7d39c9454f
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-16.0.2.9999 b/metadata/md5-cache/sys-devel/clang-runtime-16.0.3.9999
similarity index 78%
rename from metadata/md5-cache/sys-devel/clang-runtime-16.0.2.9999
rename to metadata/md5-cache/sys-devel/clang-runtime-16.0.3.9999
index f0c029155edb..a101d5d9d3ab 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-16.0.3.9999
@@ -6,7 +6,7 @@ INHERIT=multilib-build toolchain-funcs
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=metapackage
 PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.2.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.2.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.2.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.2.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-16.0.3.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-16.0.3.9999:16[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-16.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-16.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=16
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419
new file mode 100644
index 000000000000..1d776261e300
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=mirror://gcc/snapshots/10-20230419/gcc-10-20230419.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-2.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	cb15ce1344fceac0d0436457e22e5992	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=155bf158e7b00b2adad27fd8b3701c85
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230419-r1 b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230419-r1
new file mode 100644
index 000000000000..4f29c11edf14
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230419-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection modula2
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=mirror://gcc/snapshots/13.1.0-RC2-20230419/gcc-13.1.0-RC2-20230419.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	cb15ce1344fceac0d0436457e22e5992	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=823ea4ad09cfc2ad68818e926c48fa74
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index efe21277e46e..d604e2ec08d1 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=26671ae41a4c43c90c6965c6a33bad29
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 8c50e189eab0..7a0ebba4c23e 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=77afdbb022522342650c5d0c89af55de
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.1 b/metadata/md5-cache/sys-devel/lld-16.0.1
index 75d084cc6828..ccb0d8663a4b 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.1
+++ b/metadata/md5-cache/sys-devel/lld-16.0.1
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-16.0.1[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=67393891fb7b536eee357f74739193b9
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.2 b/metadata/md5-cache/sys-devel/lld-16.0.2
new file mode 100644
index 000000000000..749ca823186e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.2[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.2[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-16.0.2[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-16.0.2[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=debug test zstd test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
+RDEPEND=~sys-devel/llvm-16.0.2[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=67393891fb7b536eee357f74739193b9
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.2.9999 b/metadata/md5-cache/sys-devel/lld-16.0.3.9999
similarity index 72%
rename from metadata/md5-cache/sys-devel/lld-16.0.2.9999
rename to metadata/md5-cache/sys-devel/lld-16.0.3.9999
index 08a22c3bcca4..862fd8347f68 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/lld-16.0.3.9999
@@ -1,6 +1,6 @@
-BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.2.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.2.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-16.0.2.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=sys-devel/llvm:16 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-16.0.3.9999[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-16.0.3.9999[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-16.0.3.9999[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-16.0.2.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
+DEPEND=~sys-devel/llvm-16.0.3.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
 DESCRIPTION=The LLVM linker (link editor)
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,8 +9,8 @@ IUSE=debug test zstd test
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:16
 PROPERTIES=live
-RDEPEND=~sys-devel/llvm-16.0.2.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
+RDEPEND=~sys-devel/llvm-16.0.3.9999[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=280d570522b478b6f0784657376bc989
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0.9999 b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
index d7ae29efa8f9..bcbc2343df9e 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0.9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-17.0.0.9999[debug=,zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d7f2c2eabc9c701f5580ef1113487f1c
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325
index 5ba677006ea4..b304f3d55185 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230325[zstd=] sys-libs/zlib:= zstd? ( app-ar
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=2aef7cd1f03a5f8c85179c598fa6b22b
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414
index fe94cf8acaff..416e95cc52b8 100644
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-17.0.0_pre20230414[debug=,zstd=] sys-libs/zlib:= zstd? (
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=d7f2c2eabc9c701f5580ef1113487f1c
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index bcfb31227393..994b491a4105 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c85b453ff2e87bedb11e6b27dbbb787f
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index 6c0ac72ac592..99fbc54a4c4a 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=a76072a74390bba744b933db44e6111c
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.1 b/metadata/md5-cache/sys-devel/llvm-16.0.1
index 2d2cf8ff31e5..a02aa30d024b 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.1
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.1-manpages.tar.bz2 )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=e9c515f238c8e01a8d0fa263d2823287
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.2 b/metadata/md5-cache/sys-devel/llvm-16.0.2
new file mode 100644
index 000000000000..8d5cc51506f2
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.2
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.2.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=16/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-16.0.2-manpages.tar.bz2 )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=e9c515f238c8e01a8d0fa263d2823287
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.2.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.3.9999
similarity index 97%
rename from metadata/md5-cache/sys-devel/llvm-16.0.2.9999
rename to metadata/md5-cache/sys-devel/llvm-16.0.3.9999
index bcd714e37a75..ecd96bf50317 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.3.9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.2.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.3.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=88105e5213bbaf009c303ec910463ff0
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index 4ec729e65ef2..297e836655c4 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90285c04556af3219b6ba94284b73e9f
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325
index 4f25d24dcdcd..88ba2641af27 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=9b96ee33afc52cb77e6e3b2b841426f1
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414
index 57ddd255883d..5d730fa3f6fc 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=17/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=90285c04556af3219b6ba94284b73e9f
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index a8468af01d90..5c99ed8b2b19 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index fee5c43be48d..2140520e0e39 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.1 b/metadata/md5-cache/sys-devel/llvm-common-16.0.1
index a01477a67218..eb0b0ccd74ee 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
 _md5_=4b406f98226318955c090ac02aec5138
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.2 b/metadata/md5-cache/sys-devel/llvm-common-16.0.2
new file mode 100644
index 000000000000..dd73ca382103
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.2
@@ -0,0 +1,14 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org
+IUSE=verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=4b406f98226318955c090ac02aec5138
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.2.9999 b/metadata/md5-cache/sys-devel/llvm-common-16.0.3.9999
similarity index 72%
rename from metadata/md5-cache/sys-devel/llvm-common-16.0.2.9999
rename to metadata/md5-cache/sys-devel/llvm-common-16.0.3.9999
index 7f0921fafa0a..4f330a7ba653 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.2.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.3.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
index 7f0921fafa0a..4f330a7ba653 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
-_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325
index 974b9ec46e85..369202d7ba04 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414
index c954634a58f8..294980483721 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=llvm.org	ce14899d290c9eb1f3af2945e489b027	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_eclasses_=llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
 _md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/mold-1.11.0 b/metadata/md5-cache/sys-devel/mold-1.11.0
index 44f82ae0eea0..0e1166a7ac77 100644
--- a/metadata/md5-cache/sys-devel/mold-1.11.0
+++ b/metadata/md5-cache/sys-devel/mold-1.11.0
@@ -5,10 +5,10 @@ DESCRIPTION=A Modern Linker
 EAPI=8
 HOMEPAGE=https://github.com/rui314/mold
 INHERIT=cmake toolchain-funcs
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv ~x86
 LICENSE=AGPL-3 BSD-2
 RDEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.11.0.tar.gz -> mold-1.11.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=79c9ab581a0a51cb66383d81b4def837
+_md5_=4ffdacc67a7ce53ae521c996c5d24d0b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7027d7e07b2f..901c5dd0beed 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/mergerfs-2.35.1 b/metadata/md5-cache/sys-fs/mergerfs-2.35.1
new file mode 100644
index 000000000000..3056fa3b8a1c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/mergerfs-2.35.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext
+DEFINED_PHASES=compile install prepare
+DEPEND=xattr? ( sys-apps/attr )
+DESCRIPTION=A featureful union filesystem
+EAPI=7
+HOMEPAGE=https://github.com/trapexit/mergerfs
+INHERIT=toolchain-funcs
+IUSE=+xattr
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=ISC LGPL-2.1
+RDEPEND=xattr? ( sys-apps/attr )
+SLOT=0
+SRC_URI=https://github.com/trapexit/mergerfs/archive/2.35.1.tar.gz -> mergerfs-2.35.1.tar.gz
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=4e298f02b88ea7722ee94327e292a518
diff --git a/metadata/md5-cache/sys-fs/squashfuse-0.1.105 b/metadata/md5-cache/sys-fs/squashfuse-0.1.105
index f6a8a49598c9..eff9bddf7804 100644
--- a/metadata/md5-cache/sys-fs/squashfuse-0.1.105
+++ b/metadata/md5-cache/sys-fs/squashfuse-0.1.105
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/vasi/squashfuse
 INHERIT=autotools flag-o-matic
 IUSE=lz4 lzma lzo static-libs +zlib zstd
-KEYWORDS=~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=>=sys-fs/fuse-2.8.6:0= lzma? ( >=app-arch/xz-utils-5.0.4:= ) zlib? ( >=sys-libs/zlib-1.2.5-r2:= ) lzo? ( >=dev-libs/lzo-2.06:= ) lz4? ( >=app-arch/lz4-0_p106:= ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=|| ( lz4 lzma lzo zlib zstd )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vasi/squashfuse/archive/refs/tags/0.1.105.tar.gz -> squashfuse-0.1.105.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3cb1ab838c58721623d22e0d691970f6
+_md5_=c42cde3d703231982d88cda61921af78
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.11 b/metadata/md5-cache/sys-fs/zfs-2.1.11
new file mode 100644
index 000000000000..dfd010d9657b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.11
@@ -0,0 +1,18 @@
+BDEPEND=app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distlib[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-openzfs ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup unpack
+DEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=8
+HOMEPAGE=https://github.com/openzfs/zfs
+INHERIT=autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript verify-sig
+IUSE=custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=BSD-2 CDDL MIT
+PDEPEND=dist-kernel? ( ~sys-fs/zfs-kmod-2.1.11[dist-kernel] )
+RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= !minimal? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.1.11:= ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts app-alternatives/awk dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio app-misc/pax-utils ) selinux? ( sec-policy/selinux-zfs ) test-suite? ( app-shells/ksh sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RESTRICT=test
+SLOT=0/5
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz.asc )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	4efe951aa8ce2c16288d7c915196fe29	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=5bb29fde7f9151a8ba4229d3fd23c17f
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11
new file mode 100644
index 000000000000..b4879fe66016
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.11
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl app-alternatives/awk verify-sig? ( sec-keys/openpgp-keys-openzfs ) dist-kernel? ( <virtual/dist-kernel-6.3:= ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
+EAPI=8
+HOMEPAGE=https://github.com/openzfs/zfs
+INHERIT=autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs verify-sig
+IUSE=custom-cflags debug +rootfs dist-kernel verify-sig
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~sparc
+LICENSE=CDDL MIT debug? ( GPL-2+ )
+PDEPEND=dist-kernel? ( ~sys-fs/zfs-2.1.11[dist-kernel] )
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+RESTRICT=debug? ( strip ) test
+SLOT=0/2.1.11
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.11/zfs-2.1.11.tar.gz.asc )
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	linux-mod	e02e2112f542b74962d5d264c60a08de	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=d0d4f0cfaae31de6cafb462f3a2cf77c
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index c6bc1ee2815a..e8c04f564e68 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.313 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.313
new file mode 100644
index 000000000000..346133dc410b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.313
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.313
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-324.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-324.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-324.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-324.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-324.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-324.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=453c1907ced7b3dfd14febcd724291bb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.281 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.281
new file mode 100644
index 000000000000..91e23da4632c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.281
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.281
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-281.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-281.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-281.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-281.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-281.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-281.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=49d01e550e86ac57d93cb991d097f34d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.178
new file mode 100644
index 000000000000..38b518099d4e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.178
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.178
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-187.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-187.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-187.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-187.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-187.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-187.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=1531252228ded29ba50bb89b70a5d45a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.108 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.108
new file mode 100644
index 000000000000..9db27263d80b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.108
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.15.108
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-113.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-113.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-113.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-113.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-113.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-113.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6a8b0bd3f272b4d59250a3f20c5a7bb8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.241 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.241
new file mode 100644
index 000000000000..f2b81a6b9c15
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.241
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.241
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-247.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-247.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-247.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-247.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-247.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-247.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=93329f0607f2001ccd9a817234f1171e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.25 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.25
new file mode 100644
index 000000000000..45baba28e456
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.25
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-29.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-29.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-29.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-29.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-29.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-29.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=f68dc4fe5b401cd8755aa28f0fa0cad3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.12
new file mode 100644
index 000000000000..f113b1a1fe1a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.2 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-14.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-14.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-14.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-14.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-14.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=11275441aa77b9331f69d7f5b9c85635
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61 b/metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62
similarity index 66%
rename from metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61
rename to metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62
index f22b6e174a8d..bf27feb33e91 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61
+++ b/metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.96_p61
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.96.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.96-rt61.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.96-rt61.patch.xz
+SLOT=5.15.107_p62
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.107.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-5.15 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//5.15-gnu/deblob-check -> deblob-check-5.15 ) https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/patch-5.15.107-rt62.patch.xz https://www.kernel.org/pub/linux/kernel/projects/rt/5.15/older/patch-5.15.107-rt62.patch.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=f6a9c79ff5e6b5ea13a6fa587de67550
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.312 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.313
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.312
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.313
index 3d5f9a09a665..86c8037e1eab 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.312
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.313
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.312
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.312.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.313
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.313.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.280 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.281
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.280
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.281
index 80efbf3ca6e2..5c2e1d970f4a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.280
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.281
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.280
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.280.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.281
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.281.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.177 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.178
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.177
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.178
index 45a634f1dc7f..3ad673cba9b2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.177
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.178
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.177
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.177.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.178
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.178.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.107 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.108
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.15.107
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.15.108
index 8af2265db408..4a4f32c8aae7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.107
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.108
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.107
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.107.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.108
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.108.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.240 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.241
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.240
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.241
index 55037af79075..d8ad31c4ff53 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.240
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.241
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.240
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.240.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.241
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.241.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.24 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.25
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-6.1.24
rename to metadata/md5-cache/sys-kernel/vanilla-sources-6.1.25
index d4e224b06027..d38ad66e2195 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.24
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.25
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.1.24
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.24.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.25
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.25.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.12
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-6.2.11
rename to metadata/md5-cache/sys-kernel/vanilla-sources-6.2.12
index 67239aaba828..ddf906d5e9eb 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.12
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.2.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.11.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+SLOT=6.2.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.12.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 16a6c0566340..d6b1638f3cd3 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index 14089e03c004..cf5c1978251b 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f541873204a80a70f69b34092750b75d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 00514f8027fc..8f10cfe5e1e2 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00933d3bb15ec9382379ccab1da56544
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.1
index bd3267f05463..efeb972c6872 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8e11a0826fd0a98907657995ace17948
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.2
new file mode 100644
index 000000000000..9d597265d11a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.2*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8e11a0826fd0a98907657995ace17948
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.2.9999 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.3.9999
similarity index 87%
rename from metadata/md5-cache/sys-libs/compiler-rt-16.0.2.9999
rename to metadata/md5-cache/sys-libs/compiler-rt-16.0.3.9999
index bb400783249d..bb1a3e58d635 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.3.9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.2*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.3*:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=937f480d6f34d4d8afd91781d18537cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
index 83d0d4d7c461..1369e9b17b10 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=937f480d6f34d4d8afd91781d18537cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325
index 0ade6c35779b..0189950338d6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=937f480d6f34d4d8afd91781d18537cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414
index 51e27f1f536e..9797579c6f1d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=937f480d6f34d4d8afd91781d18537cf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index 96e01d4dbc01..0861768325f7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1c1c912e6047d4dbf13b18213c38e789
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index bda426ee939f..396f626430ac 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=073adf97b984c7834ca31d3d6fe4093c
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1
index bb291dbd528f..8ff975361ba9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5e86c8a095c456e604a05f5ebefd11e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2
new file mode 100644
index 000000000000..c5c442bdd42a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.2*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
+SLOT=16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=5e86c8a095c456e604a05f5ebefd11e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3.9999
similarity index 90%
rename from metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2.9999
rename to metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3.9999
index fea11e16d8f5..b5d97765bc0c 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3.9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.2*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ) =sys-devel/clang-16.0.3*:16 sys-libs/compiler-rt:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=sys-devel/llvm:16 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
index 4b8c15b6da46..bc316e753ad4 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325
index 3e403b913290..e8efc0d67f60 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414
index 25d8659d49e1..14991a2b47fd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=17
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=049242e85f6315c7ba29f81552c29f36
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.10-r1 b/metadata/md5-cache/sys-libs/cracklib-2.9.10-r1
index 861390f9e9a9..01a639f88133 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.10-r1
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.10-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cracklib/cracklib/
 INHERIT=distutils-r1 libtool multilib-minimal usr-ldscript
 IUSE=nls python static-libs zlib test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.10/cracklib-2.9.10.tar.bz2
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=5da22de454141134ca480a915bdb8407
+_md5_=06ea556c84f2f70239beb1ace190a741
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index 720ba92baf0c..5ef283939f1c 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=40053cea23101c5d660398cf97045038
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 525a7e70c455..eaf380eccccf 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bf73ff84b34d3321dab6eea4bfd4f08
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index 4f3272168156..fc3efba2aa39 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=c415047838316b6921b40e0d66ed4aa0
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.1 b/metadata/md5-cache/sys-libs/libcxx-16.0.1
index 14b09246b3c8..c1a2836156f4 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fd7c42169ca32c9cedf32100d0a56aec
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.2 b/metadata/md5-cache/sys-libs/libcxx-16.0.2
new file mode 100644
index 000000000000..f42f71297eb4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=8
+HOMEPAGE=https://libcxx.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=fd7c42169ca32c9cedf32100d0a56aec
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.2.9999 b/metadata/md5-cache/sys-libs/libcxx-16.0.3.9999
similarity index 89%
rename from metadata/md5-cache/sys-libs/libcxx-16.0.2.9999
rename to metadata/md5-cache/sys-libs/libcxx-16.0.3.9999
index 50ca4b159d73..4047971faffa 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.3.9999
@@ -1,6 +1,6 @@
 BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.2.9999[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.3.9999[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:16 !!sys-devel/llvm:0
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
@@ -8,9 +8,9 @@ INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.2.9999[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-16.0.3.9999[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
index 001e269a1066..27b55ee797c9 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0.9999[static-libs?,abi_x86_32(-)?
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325
index f0cb3d065c63..326308b8f651 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414
index 866813963dca..bb837b0e2bd7 100644
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=6bd8767076a012461810ec35f7118298
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 9272f7bd3760..ff14a9ed82de 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=00c7e2cea0ff0c7d843b9d8560e1e855
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 01121332430b..947e507fa580 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=7caa8da5e3680e5172ba7e29f5004e58
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.1
index c5f0e7922467..dfb83645353e 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8eca3feceb803430599b9e66d61b5a6c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.2 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.2
new file mode 100644
index 000000000000..d790be0ff256
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!<sys-libs/libcxx-15
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8eca3feceb803430599b9e66d61b5a6c
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.2.9999 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.3.9999
similarity index 93%
rename from metadata/md5-cache/sys-libs/libcxxabi-16.0.2.9999
rename to metadata/md5-cache/sys-libs/libcxxabi-16.0.3.9999
index 232a890ea07a..8ab436bf5124 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.3.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
index 0f3754da4638..5630e28cb797 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325
index 1b378a587626..99253018a204 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414
index 0c6636ea323d..eb4d546eddcf 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=ab2664cef513146a1fff74697dfca74f
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index 4cd25afc430c..099a08c219bf 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=55c75cae8b91cb6694cc87a534f0ba90
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
index 293c3f7e81e8..b3f32d6f5faf 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
@@ -12,5 +12,5 @@ RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r2.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=919fc31c2f3e10e592ad25fa7fc1b724
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.1 b/metadata/md5-cache/sys-libs/libomp-16.0.1
index 694440507c30..7695245272fe 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=851d5b8a0334588b10b7546fa4e838c9
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.2 b/metadata/md5-cache/sys-libs/libomp-16.0.2
new file mode 100644
index 000000000000..f5b3ac772945
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
+IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
+REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0/16
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=851d5b8a0334588b10b7546fa4e838c9
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.2.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.3.9999
similarity index 95%
rename from metadata/md5-cache/sys-libs/libomp-16.0.2.9999
rename to metadata/md5-cache/sys-libs/libomp-16.0.3.9999
index 7027e33f78e1..a351e5462ad3 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.3.9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.2.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
+DEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 to
 IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.2.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
+RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.3.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/16
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a834663f3fa2fb5dcb371c76b2f4195
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index af092367b934..6e01e0eef88a 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=gdb-plugin? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0.9999
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a834663f3fa2fb5dcb371c76b2f4195
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325
index 085f1eb1c1a2..f55f0b779163 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230325
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a834663f3fa2fb5dcb371c76b2f4195
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414
index a691de55e74c..2ed85355db38 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_9 python_single_tar
 RESTRICT=!test? ( test )
 SLOT=0/17.0.0_pre20230414
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1a834663f3fa2fb5dcb371c76b2f4195
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index aee7bb2f7e0a..7c31c6c51742 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=25063be8361a17395740423df3d4e2ff
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 81729ac38901..09198c9387b3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0304c4cd124df43254ba42ff0fa5e262
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1
index 32006867400c..beb4e501f6ec 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.1/llvm-project-16.0.1.src.tar.xz.sig )
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=f7ba76b42c0124510879b1ca8649d2dd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2
new file mode 100644
index 000000000000..eb50ece65201
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2
@@ -0,0 +1,17 @@
+BDEPEND=clang? ( sys-devel/clang:16 ) !test? ( || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) test? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ) ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/llvm:16 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
+INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+REQUIRED_USE=test? ( clang )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.2/llvm-project-16.0.2.src.tar.xz.sig )
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f7ba76b42c0124510879b1ca8649d2dd
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3.9999
similarity index 93%
rename from metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2.9999
rename to metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3.9999
index 1e20c2f1c654..623028020915 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
index 6c61e5a854af..cb572ac36e0d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325
index 5cb15eeb521b..9085f16cf5c5 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz -> llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414
index e5802de9b6d7..eb35182cd649 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz -> llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	ce14899d290c9eb1f3af2945e489b027	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	fd1545f09b4c2ee7964da78dab738f1f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=3a7fb57c21821d5d3fb7dd531521954b
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.4_p20230418 b/metadata/md5-cache/sys-libs/ncurses-6.4_p20230418
new file mode 100644
index 000000000000..053e84c9259c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.4_p20230418
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst test unpack
+DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Console display library
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/
+INHERIT=flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+IUSE=ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.4.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.4.tar.gz https://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.4.tar.gz.sig ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230107.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230114.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230121.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230128.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230218.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230311.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230401.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230408.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230415.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.4/ncurses-6.4-20230418.patch.gz.asc ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.4_p20230418-patches.tar.xz
+_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=80f4cb7623986f6fcbd8e5eb97657d30
diff --git a/metadata/md5-cache/sys-libs/snapd-glib-1.63 b/metadata/md5-cache/sys-libs/snapd-glib-1.63
new file mode 100644
index 000000000000..8f9342fb38a5
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/snapd-glib-1.63
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig sys-devel/gettext qt5? ( dev-qt/linguist-tools:5 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-libs/json-glib dev-libs/glib:2 dev-util/glib-utils net-libs/libsoup:3.0 doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) vala? ( || ( dev-lang/vala:0.56 ) )
+DESCRIPTION=glib library for communicating with snapd
+EAPI=8
+HOMEPAGE=https://snapcraft.io/
+INHERIT=meson vala
+IUSE=doc introspection qml qt5 vala
+KEYWORDS=~amd64
+LICENSE=LGPL-3
+RDEPEND=dev-libs/json-glib dev-libs/glib:2 dev-util/glib-utils net-libs/libsoup:3.0 doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-containers/snapd
+REQUIRED_USE=qml? ( qt5 ) vala? ( introspection )
+SLOT=0/1
+SRC_URI=https://github.com/snapcore/snapd-glib/releases/download/1.63/snapd-glib-1.63.tar.xz
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d
+_md5_=a2e800e9b1ae6cb5bd0f2a86c37267ed
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 41382441bd0f..9767454ec5aa 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/bottom-0.8.0-r1 b/metadata/md5-cache/sys-process/bottom-0.8.0-r1
new file mode 100644
index 000000000000..5284eee375a4
--- /dev/null
+++ b/metadata/md5-cache/sys-process/bottom-0.8.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A graphical process/system monitor with a customizable interface
+EAPI=8
+HOMEPAGE=https://github.com/ClementTsang/bottom
+INHERIT=bash-completion-r1 cargo
+IUSE=+battery +gpu +zfs debug
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/addr2line/0.19.0/download -> addr2line-0.19.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-fs/1.5.0/download -> async-fs-1.5.0.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-net/1.6.1/download -> async-net-1.6.1.crate https://crates.io/api/v1/crates/async-process/1.3.0/download -> async-process-1.3.0.crate https://crates.io/api/v1/crates/async-task/4.2.0/download -> async-task-4.2.0.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.67/download -> backtrace-0.3.67.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blocking/1.2.0/download -> blocking-1.2.0.crate https://crates.io/api/v1/crates/bottom/0.8.0/download -> bottom-0.8.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clap/3.1.12/download -> clap-3.1.12.crate https://crates.io/api/v1/crates/clap_complete/3.1.2/download -> clap_complete-3.1.2.crate https://crates.io/api/v1/crates/clap_lex/0.1.1/download -> clap_lex-0.1.1.crate https://crates.io/api/v1/crates/clap_mangen/0.1.6/download -> clap_mangen-0.1.6.crate https://crates.io/api/v1/crates/concat-string/1.0.1/download -> concat-string-1.0.1.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/const_format/0.2.30/download -> const_format-0.2.30.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.29/download -> const_format_proc_macros-0.2.29.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crossterm/0.25.0/download -> crossterm-0.25.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/ctrlc/3.2.4/download -> ctrlc-3.2.4.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fern/0.6.1/download -> fern-0.6.1.crate https://crates.io/api/v1/crates/filedescriptor/0.8.2/download -> filedescriptor-0.8.2.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/futures/0.3.25/download -> futures-0.3.25.crate https://crates.io/api/v1/crates/futures-channel/0.3.25/download -> futures-channel-0.3.25.crate https://crates.io/api/v1/crates/futures-core/0.3.25/download -> futures-core-0.3.25.crate https://crates.io/api/v1/crates/futures-executor/0.3.25/download -> futures-executor-0.3.25.crate https://crates.io/api/v1/crates/futures-io/0.3.25/download -> futures-io-0.3.25.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.25/download -> futures-macro-0.3.25.crate https://crates.io/api/v1/crates/futures-sink/0.3.25/download -> futures-sink-0.3.25.crate https://crates.io/api/v1/crates/futures-task/0.3.25/download -> futures-task-0.3.25.crate https://crates.io/api/v1/crates/futures-timer/3.0.2/download -> futures-timer-3.0.2.crate https://crates.io/api/v1/crates/futures-util/0.3.25/download -> futures-util-0.3.25.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.27.0/download -> gimli-0.27.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/heim/0.1.0-rc.1/download -> heim-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-common/0.1.0-rc.1/download -> heim-common-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-cpu/0.1.0-rc.1/download -> heim-cpu-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-disk/0.1.0-rc.1/download -> heim-disk-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-memory/0.1.0-rc.1/download -> heim-memory-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-net/0.1.0-rc.1/download -> heim-net-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-runtime/0.1.0-rc.1/download -> heim-runtime-0.1.0-rc.1.crate https://crates.io/api/v1/crates/heim-sensors/0.1.0-rc.1/download -> heim-sensors-0.1.0-rc.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/indexmap/1.9.2/download -> indexmap-1.9.2.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/itertools/0.10.5/download -> itertools-0.10.5.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/kstring/2.0.0/download -> kstring-2.0.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.137/download -> libc-0.2.137.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/macaddr/1.0.1/download -> macaddr-1.0.1.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/mach2/0.4.1/download -> mach2-0.4.1.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/mio/0.8.5/download -> mio-0.8.5.crate https://crates.io/api/v1/crates/nix/0.19.1/download -> nix-0.19.1.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nix/0.26.1/download -> nix-0.26.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/ntapi/0.4.0/download -> ntapi-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.5/download -> num_threads-0.1.5.crate https://crates.io/api/v1/crates/nvml-wrapper/0.8.0/download -> nvml-wrapper-0.8.0.crate https://crates.io/api/v1/crates/nvml-wrapper-sys/0.6.0/download -> nvml-wrapper-sys-0.6.0.crate https://crates.io/api/v1/crates/object/0.30.2/download -> object-0.30.2.crate https://crates.io/api/v1/crates/once_cell/1.5.2/download -> once_cell-1.5.2.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.4/download -> parking_lot_core-0.9.4.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.49/download -> proc-macro2-1.0.49.crate https://crates.io/api/v1/crates/procfs/0.14.2/download -> procfs-0.14.2.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rayon/1.5.2/download -> rayon-1.5.2.crate https://crates.io/api/v1/crates/rayon-core/1.9.2/download -> rayon-core-1.9.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/roff/0.2.1/download -> roff-0.2.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustix/0.36.6/download -> rustix-0.36.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smol/1.2.5/download -> smol-1.2.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/starship-battery/0.7.9/download -> starship-battery-0.7.9.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/sysctl/0.5.2/download -> sysctl-0.5.2.crate https://crates.io/api/v1/crates/sysinfo/0.26.7/download -> sysinfo-0.26.7.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.38/download -> thiserror-1.0.38.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.38/download -> thiserror-impl-1.0.38.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/toml/0.5.10/download -> toml-0.5.10.crate https://crates.io/api/v1/crates/tui/0.19.0/download -> tui-0.19.0.crate https://crates.io/api/v1/crates/typed-builder/0.10.0/download -> typed-builder-0.10.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.10.0/download -> unicode-segmentation-1.10.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/uom/0.30.0/download -> uom-0.30.0.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/widestring/0.4.3/download -> widestring-0.4.3.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.44.0/download -> windows-0.44.0.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.1/download -> windows-targets-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.1/download -> windows_aarch64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.1/download -> windows_aarch64_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.1/download -> windows_i686_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.1/download -> windows_i686_msvc-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.1/download -> windows_x86_64_gnu-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.1/download -> windows_x86_64_gnullvm-0.42.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.1/download -> windows_x86_64_msvc-0.42.1.crate https://crates.io/api/v1/crates/wrapcenum-derive/0.4.0/download -> wrapcenum-derive-0.4.0.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	2e0a4a329a7dc5dfe20dcb05e6c36935	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=cf84bc7324a84de1518b95fb939c8853
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 42a0be61f3ce..0ee2d5710774 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1 b/metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1
index 5d002ae961f7..69fa0936ee31 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
 INHERIT=apache-module python-single-r1
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) =www-servers/apache-2*
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.9.4.tar.gz -> mod_wsgi-4.9.4.gh.tar.gz
 _eclasses_=apache-module	c39c4721f3b26f641833bddb8ee0718e	depend.apache	416d1c5005c5f4594e79812fb7323f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=931a6e811e9028a7491c078c77543614
+_md5_=dd07cb7be14dacb0e7d5acc3b7521fcd
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 36cea78cee9d..402ca1f867ed 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/drupal-10.0.5 b/metadata/md5-cache/www-apps/drupal-10.0.8
similarity index 89%
rename from metadata/md5-cache/www-apps/drupal-10.0.5
rename to metadata/md5-cache/www-apps/drupal-10.0.8
index 59917362f152..a762c31cc3a1 100644
--- a/metadata/md5-cache/www-apps/drupal-10.0.5
+++ b/metadata/md5-cache/www-apps/drupal-10.0.8
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php:8.1[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress[php_targets_php8-1] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=10.0.5
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-10.0.5.tar.gz
+SLOT=10.0.8
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-10.0.8.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=855f281fb725cc453742abe5c01193bf
diff --git a/metadata/md5-cache/www-apps/drupal-7.95 b/metadata/md5-cache/www-apps/drupal-7.96
similarity index 89%
rename from metadata/md5-cache/www-apps/drupal-7.95
rename to metadata/md5-cache/www-apps/drupal-7.96
index bc56d81e7dd5..89487d0f727f 100644
--- a/metadata/md5-cache/www-apps/drupal-7.95
+++ b/metadata/md5-cache/www-apps/drupal-7.96
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.95
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.95.tar.gz
+SLOT=7.96
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.96.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=7578c6dd648e77c086c2bdcfa5ce3f69
diff --git a/metadata/md5-cache/www-apps/drupal-9.4.12 b/metadata/md5-cache/www-apps/drupal-9.4.14
similarity index 89%
rename from metadata/md5-cache/www-apps/drupal-9.4.12
rename to metadata/md5-cache/www-apps/drupal-9.4.14
index e86bf639e227..b43e9e81b107 100644
--- a/metadata/md5-cache/www-apps/drupal-9.4.12
+++ b/metadata/md5-cache/www-apps/drupal-9.4.14
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.4.12
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.4.12.tar.gz
+SLOT=9.4.14
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.4.14.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=571e70e56bc5167b957e4061344af5e0
diff --git a/metadata/md5-cache/www-apps/drupal-9.5.5 b/metadata/md5-cache/www-apps/drupal-9.5.8
similarity index 89%
rename from metadata/md5-cache/www-apps/drupal-9.5.5
rename to metadata/md5-cache/www-apps/drupal-9.5.8
index a72d8390a7d9..7cb52b66b2a2 100644
--- a/metadata/md5-cache/www-apps/drupal-9.5.5
+++ b/metadata/md5-cache/www-apps/drupal-9.5.8
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.5.5
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.5.5.tar.gz
+SLOT=9.5.8
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.5.8.tar.gz
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=571e70e56bc5167b957e4061344af5e0
diff --git a/metadata/md5-cache/www-apps/xpra-html5-6.1 b/metadata/md5-cache/www-apps/xpra-html5-6.1
index 899600113dce..a5682e479e96 100644
--- a/metadata/md5-cache/www-apps/xpra-html5-6.1
+++ b/metadata/md5-cache/www-apps/xpra-html5-6.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://xpra.org/
 INHERIT=python-any-r1
 IUSE=brotli +gzip minify
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MPL-2.0
 SLOT=0
 SRC_URI=https://github.com/Xpra-org/xpra-html5/archive/refs/tags/v6.1.tar.gz -> xpra-html5-6.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a36311c90216150b54d8b1fe2decc0f6
+_md5_=dee62bbd975b66aae1c838ced66f96e7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 895d60ef1120..6049bc60c7de 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-112.0.5615.121 b/metadata/md5-cache/www-client/chromium-112.0.5615.121
new file mode 100644
index 000000000000..0b572201ca1c
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-112.0.5615.121
@@ -0,0 +1,16 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] >=dev-lang/python-3.10.9-r1:3.10[xml(+)] >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) || ( ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] dev-python/setuptools[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ) >=app-arch/gzip-1.7 !headless? ( qt5? ( dev-qt/qtcore:5 ) ) libcxx? ( >=sys-devel/clang-13 ) lto? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=amd64 ~arm64 ~ppc64
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
+SLOT=0/stable
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-112.0.5615.121.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+_eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=3860d48653a528fdc939b950224f168a
diff --git a/metadata/md5-cache/www-client/chromium-112.0.5615.49 b/metadata/md5-cache/www-client/chromium-112.0.5615.49
index 7dc02152dbbb..436251da56a8 100644
--- a/metadata/md5-cache/www-client/chromium-112.0.5615.49
+++ b/metadata/md5-cache/www-client/chromium-112.0.5615.49
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng(-)] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-3.4.0:= ) sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/libffi:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) qt5? ( dev-qt/qtgui:5[X?,wayland?] ) ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-112.0.5615.49.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_111.0.5563.64-1raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-112.0.5615.49.tar.xz ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	chromium-2	93690d770dc2e27deaa89794e2f9fe3f	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b90d59a1145a4d0497f153887820758c
+_md5_=26664eb389a6f3e64e4568376bfc7a6b
diff --git a/metadata/md5-cache/www-client/firefox-112.0.1 b/metadata/md5-cache/www-client/firefox-112.0.1
index 102b934fe0d1..543f03e36868 100644
--- a/metadata/md5-cache/www-client/firefox-112.0.1
+++ b/metadata/md5-cache/www-client/firefox-112.0.1
@@ -12,6 +12,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:esr screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.89 >=dev-libs/nspr-4.35 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) pulseaudio? ( || ( media-libs/libpulse >=media-sound/apulse-0.1.12-r4[sdk] ) ) libproxy? ( net-libs/libproxy ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-72.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads(+)] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( >=media-libs/libepoxy-1.5.10-r1 x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) X? ( virtual/opengl x11-libs/cairo[X] x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon[X] x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] )
 REQUIRED_USE=|| ( X wayland ) debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
 SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/112.0.1/source/firefox-112.0.1.source.tar.xz -> firefox-112.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-112-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-112-patches-03j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-112-patches-03j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/af.xpi -> firefox-112.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ar.xpi -> firefox-112.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ast.xpi -> firefox-112.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/be.xpi -> firefox-112.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bg.xpi -> firefox-112.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/br.xpi -> firefox-112.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ca.xpi -> firefox-112.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cak.xpi -> firefox-112.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cs.xpi -> firefox-112.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cy.xpi -> firefox-112.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/da.xpi -> firefox-112.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/de.xpi -> firefox-112.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-112.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/el.xpi -> firefox-112.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-112.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-112.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-112.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-112.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/et.xpi -> firefox-112.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/eu.xpi -> firefox-112.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fi.xpi -> firefox-112.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fr.xpi -> firefox-112.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-112.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-112.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gd.xpi -> firefox-112.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gl.xpi -> firefox-112.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/he.xpi -> firefox-112.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hr.xpi -> firefox-112.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-112.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hu.xpi -> firefox-112.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/id.xpi -> firefox-112.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/is.xpi -> firefox-112.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/it.xpi -> firefox-112.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ja.xpi -> firefox-112.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ka.xpi -> firefox-112.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kab.xpi -> firefox-112.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kk.xpi -> firefox-112.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ko.xpi -> firefox-112.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lt.xpi -> firefox-112.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lv.xpi -> firefox-112.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ms.xpi -> firefox-112.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-112.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nl.xpi -> firefox-112.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-112.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-112.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pl.xpi -> firefox-112.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-112.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-112.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/rm.xpi -> firefox-112.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ro.xpi -> firefox-112.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ru.xpi -> firefox-112.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sk.xpi -> firefox-112.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sl.xpi -> firefox-112.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sq.xpi -> firefox-112.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sr.xpi -> firefox-112.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-112.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/th.xpi -> firefox-112.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/tr.xpi -> firefox-112.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/uk.xpi -> firefox-112.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/uz.xpi -> firefox-112.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/vi.xpi -> firefox-112.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-112.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-112.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ach.xpi -> firefox-112.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/an.xpi -> firefox-112.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/az.xpi -> firefox-112.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bn.xpi -> firefox-112.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bs.xpi -> firefox-112.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-112.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/eo.xpi -> firefox-112.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-112.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-112.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fa.xpi -> firefox-112.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ff.xpi -> firefox-112.0.1-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fur.xpi -> firefox-112.0.1-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gn.xpi -> firefox-112.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-112.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-112.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-112.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ia.xpi -> firefox-112.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/km.xpi -> firefox-112.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kn.xpi -> firefox-112.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lij.xpi -> firefox-112.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/mk.xpi -> firefox-112.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/mr.xpi -> firefox-112.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/my.xpi -> firefox-112.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-112.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/oc.xpi -> firefox-112.0.1-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sc.xpi -> firefox-112.0.1-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sco.xpi -> firefox-112.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/si.xpi -> firefox-112.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/son.xpi -> firefox-112.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/szl.xpi -> firefox-112.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ta.xpi -> firefox-112.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/te.xpi -> firefox-112.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/tl.xpi -> firefox-112.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/trs.xpi -> firefox-112.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ur.xpi -> firefox-112.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/xh.xpi -> firefox-112.0.1-xh.xpi )
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/112.0.1/source/firefox-112.0.1.source.tar.xz -> firefox-112.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-112-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-112-patches-04j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-112-patches-04j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/af.xpi -> firefox-112.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ar.xpi -> firefox-112.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ast.xpi -> firefox-112.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/be.xpi -> firefox-112.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bg.xpi -> firefox-112.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/br.xpi -> firefox-112.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ca.xpi -> firefox-112.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cak.xpi -> firefox-112.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cs.xpi -> firefox-112.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/cy.xpi -> firefox-112.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/da.xpi -> firefox-112.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/de.xpi -> firefox-112.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-112.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/el.xpi -> firefox-112.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-112.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-112.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-112.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-112.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/et.xpi -> firefox-112.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/eu.xpi -> firefox-112.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fi.xpi -> firefox-112.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fr.xpi -> firefox-112.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-112.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-112.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gd.xpi -> firefox-112.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gl.xpi -> firefox-112.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/he.xpi -> firefox-112.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hr.xpi -> firefox-112.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-112.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hu.xpi -> firefox-112.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/id.xpi -> firefox-112.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/is.xpi -> firefox-112.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/it.xpi -> firefox-112.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ja.xpi -> firefox-112.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ka.xpi -> firefox-112.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kab.xpi -> firefox-112.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kk.xpi -> firefox-112.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ko.xpi -> firefox-112.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lt.xpi -> firefox-112.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lv.xpi -> firefox-112.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ms.xpi -> firefox-112.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-112.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nl.xpi -> firefox-112.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-112.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-112.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pl.xpi -> firefox-112.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-112.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-112.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/rm.xpi -> firefox-112.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ro.xpi -> firefox-112.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ru.xpi -> firefox-112.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sk.xpi -> firefox-112.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sl.xpi -> firefox-112.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sq.xpi -> firefox-112.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sr.xpi -> firefox-112.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-112.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/th.xpi -> firefox-112.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/tr.xpi -> firefox-112.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/uk.xpi -> firefox-112.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/uz.xpi -> firefox-112.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/vi.xpi -> firefox-112.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-112.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-112.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ach.xpi -> firefox-112.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/an.xpi -> firefox-112.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/az.xpi -> firefox-112.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bn.xpi -> firefox-112.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/bs.xpi -> firefox-112.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-112.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/eo.xpi -> firefox-112.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-112.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-112.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fa.xpi -> firefox-112.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ff.xpi -> firefox-112.0.1-ff.xpi ) l10n_fur? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/fur.xpi -> firefox-112.0.1-fur.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gn.xpi -> firefox-112.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-112.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-112.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-112.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ia.xpi -> firefox-112.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/km.xpi -> firefox-112.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/kn.xpi -> firefox-112.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/lij.xpi -> firefox-112.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/mk.xpi -> firefox-112.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/mr.xpi -> firefox-112.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/my.xpi -> firefox-112.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-112.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/oc.xpi -> firefox-112.0.1-oc.xpi ) l10n_sc? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sc.xpi -> firefox-112.0.1-sc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/sco.xpi -> firefox-112.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/si.xpi -> firefox-112.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/son.xpi -> firefox-112.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/szl.xpi -> firefox-112.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ta.xpi -> firefox-112.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/te.xpi -> firefox-112.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/tl.xpi -> firefox-112.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/trs.xpi -> firefox-112.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/ur.xpi -> firefox-112.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/112.0.1/linux-x86_64/xpi/xh.xpi -> firefox-112.0.1-xh.xpi )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b527422cbf19ce65e02954412a3297a5
+_md5_=82c2c4a037bd14bbe4fde2c3d4b6fffa
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 5978089b3a08..c9d2c50f9034 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.25 b/metadata/md5-cache/www-misc/urlwatch-2.25
index 57c716727b28..950709c88b2c 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.25
+++ b/metadata/md5-cache/www-misc/urlwatch-2.25
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://thp.io/2008/urlwatch/ https://github.com/thp/urlwatch/ https://pypi.org/project/urlwatch/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/appdirs[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cssselect[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/minidb-2.0.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/u/urlwatch/urlwatch-2.25.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4b696a67b685cb0c545083d962b1285b
+_md5_=6387d07f3cd2ee03905cc94593a177b8
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d7bdf64e8d9d..f5ff73bd6780 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/nginx-1.23.2 b/metadata/md5-cache/www-servers/nginx-1.24.0
similarity index 69%
rename from metadata/md5-cache/www-servers/nginx-1.23.2
rename to metadata/md5-cache/www-servers/nginx-1.24.0
index 0e56df4b0458..a158085f410a 100644
--- a/metadata/md5-cache/www-servers/nginx-1.23.2
+++ b/metadata/md5-cache/www-servers/nginx-1.24.0
@@ -6,13 +6,13 @@ EAPI=8
 HOMEPAGE=https://nginx.org
 INHERIT=autotools lua-single ssl-cert toolchain-funcs perl-module systemd pax-utils
 IUSE=aio debug +http +http2 +http-cache libatomic pcre +pcre2 pcre-jit rtmp selinux ssl threads vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy +lua_single_target_luajit
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RDEPEND=acct-group/nginx acct-user/nginx virtual/libcrypt:= pcre? ( dev-libs/libpcre:= ) pcre2? ( dev-libs/libpcre2:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( dev-libs/openssl:0= ) http2? ( >=dev-libs/openssl-1.0.1c:0= ) http-cache? ( dev-libs/openssl:0= ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( dev-libs/openssl:0= ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) nginx_modules_http_auth_pam? ( sys-libs/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/modsecurity ) nginx_modules_http_auth_ldap? ( net-nds/openldap:=[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) app-misc/mime-types[nginx] selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_fancyindex? ( nginx_modules_http_addition ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( ^^ ( lua_single_target_luajit ) nginx_modules_http_rewrite pcre !pcre2 ) nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.23.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.62.tar.gz -> ngx_http_echo-0.62.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz -> ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.7.tar.gz -> njs-0.7.7.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SLOT=0
+SRC_URI=https://nginx.org/download/nginx-1.24.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.2.tar.gz -> ngx_http_auth_pam-1.5.2.tar.gz ) nginx_modules_http_brotli? ( https://github.com/google/ngx_brotli/archive/v1.0.0rc.tar.gz -> ngx_brotli-1.0.0rc.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.63.tar.gz -> ngx_http_echo-0.63.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.4.tar.gz -> ngx_http_fancyindex-0.4.4.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/openresty/headers-more-nginx-module/archive/v0.34.tar.gz -> ngx_http_headers_more-0.34.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.7.8.tar.gz -> njs-0.7.8.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz -> ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/wargio/naxsi/archive/4140b2ded624eb36f04c783c460379b9403012d0.tar.gz -> ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz https://github.com/libinjection/libinjection/archive/49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz -> ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz -> ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz ) nginx_modules_http_security? ( https://github.com/SpiderLabs/ModSecurity-nginx/archive/refs/tags/v1.0.3.tar.gz -> modsecurity-nginx-1.0.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz -> ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.2.1.tar.gz -> ngx_http_vhost_traffic_status-0.2.1.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.4.tar.gz -> ngx_http_geoip2_module-3.4.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.7.8.tar.gz -> njs-0.7.8.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.2.tar.gz -> ngx_rtmp-1.2.2.tar.gz )
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	8c55459fea879ccdec282839a3b22f78	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=b2c522d2420dd6609aadc96d7d72280b
+_md5_=2ad8e3b3416693a6d4b60006fca4e0db
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.8 b/metadata/md5-cache/www-servers/tomcat-10.1.8
new file mode 100644
index 000000000000..816d7b76c6e6
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.8
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.8:10.1.8 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz.asc )
+_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=4715795a1d8c909468fb9b1a1abcce2b
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.88 b/metadata/md5-cache/www-servers/tomcat-8.5.88
new file mode 100644
index 000000000000..c2a0902751a0
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.88
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.88:8.5.88 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc )
+_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=a0bf378037d796d2ac9e271322d4c57b
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.74 b/metadata/md5-cache/www-servers/tomcat-9.0.74
new file mode 100644
index 000000000000..28874a2bf737
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.74
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.74:9.0.74 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.74/src/apache-tomcat-9.0.74-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.74/src/apache-tomcat-9.0.74-src.tar.gz.asc )
+_eclasses_=java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
+_md5_=bbf7b93abe7b9c0db50d88504df1437e
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 4f62f2bc35fb..733c7c9d40a0 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1 b/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1
index 10b836cb896c..945818ae0c11 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wxwidgets.org/
 INHERIT=multilib-minimal
 IUSE=+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )
 RDEPEND=>=app-eselect/eselect-wxwidgets-20131230 dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libpcre2[pcre16,pcre32,unicode] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl? ( net-misc/curl ) lzma? ( app-arch/xz-utils ) X? ( >=dev-libs/glib-2.22:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libSM[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig x11-libs/pango[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-base:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gst-plugins-bad:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libnotify? ( x11-libs/libnotify[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( dev-libs/wayland ) ) spell? ( app-text/gspell:= ) tiff? ( media-libs/tiff:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webkit? ( net-libs/webkit-gtk:4= ) )
 REQUIRED_USE=test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-keyring? ( X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3.2-gtk3
 SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2 doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1-docs-html.tar.bz2 )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e855b9046bd4caff196e90cd3c52f61c
+_md5_=572ee1a5db888c01e6368019fb027efc
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f45ac377aab8..9d21cf1f3d8e 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/dunst-1.9.0 b/metadata/md5-cache/x11-misc/dunst-1.9.0
deleted file mode 100644
index 88d1d6083b15..000000000000
--- a/metadata/md5-cache/x11-misc/dunst-1.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig wayland? ( dev-libs/wayland-protocols ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-DESCRIPTION=Lightweight replacement for common notification daemons
-EAPI=8
-HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
-INHERIT=systemd toolchain-funcs
-IUSE=wayland
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
-SLOT=0
-SRC_URI=https://github.com/dunst-project/dunst/archive/v1.9.0.tar.gz -> dunst-1.9.0.tar.gz
-_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4e811b5caad38531d2f4ad8af804aae5
diff --git a/metadata/md5-cache/x11-misc/dunst-1.9.1 b/metadata/md5-cache/x11-misc/dunst-1.9.1
index 62ddd5654f72..0f28360f2f69 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.9.1
+++ b/metadata/md5-cache/x11-misc/dunst-1.9.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://dunst-project.org/ https://github.com/dunst-project/dunst
 INHERIT=systemd toolchain-funcs
 IUSE=wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/libnotify x11-libs/pango[X] x11-misc/xdg-utils wayland? ( dev-libs/wayland )
 SLOT=0
 SRC_URI=https://github.com/dunst-project/dunst/archive/v1.9.1.tar.gz -> dunst-1.9.1.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6562f28e455391d6197042637e0530f2
+_md5_=ddf4df46b90066288fe0bb84e0ffa66a
diff --git a/metadata/md5-cache/x11-misc/picom-10.2 b/metadata/md5-cache/x11-misc/picom-10.2
index 6309eda29d10..0f20d0b73dbc 100644
--- a/metadata/md5-cache/x11-misc/picom-10.2
+++ b/metadata/md5-cache/x11-misc/picom-10.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://github.com/yshui/picom
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson python-any-r1 virtualx xdg
 IUSE=+config-file dbus +doc +drm opengl pcre test test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0 MIT
 RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 REQUIRED_USE=test? ( dbus )
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yshui/picom/archive/v10.2.tar.gz -> picom-10.2.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=58c0f28e0e4bd458eaf887ff46b572ff
+_md5_=2371dd6d9919af0dd0d248868e8138d0
diff --git a/metadata/md5-cache/x11-misc/py3status-3.49 b/metadata/md5-cache/x11-misc/py3status-3.50
similarity index 95%
rename from metadata/md5-cache/x11-misc/py3status-3.49
rename to metadata/md5-cache/x11-misc/py3status-3.50
index d5b5b814709d..bedd72b71ae6 100644
--- a/metadata/md5-cache/x11-misc/py3status-3.49
+++ b/metadata/md5-cache/x11-misc/py3status-3.50
@@ -12,6 +12,6 @@ RDEPEND=!minimal? ( x11-misc/i3status ) udev? ( >=dev-python/pyudev-0.21.0[pytho
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.49.tar.gz -> py3status-3.49.tar.gz
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.50.tar.gz -> py3status-3.50.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
 _md5_=5bb2d6676a0656dda34e694f16b50387
diff --git a/metadata/md5-cache/x11-misc/zim-0.75.1 b/metadata/md5-cache/x11-misc/zim-0.75.1
index 5493a271bd7c..aeb375e3a0c4 100644
--- a/metadata/md5-cache/x11-misc/zim-0.75.1
+++ b/metadata/md5-cache/x11-misc/zim-0.75.1
@@ -7,7 +7,7 @@ HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-w
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 optfeature virtualx xdg
 IUSE=python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=BSD GPL-2+
 RDEPEND=python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/pyxdg[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/pyxdg[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/pyxdg[python_targets_python3_11(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.75.1.tar.gz -> zim-0.75.1.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=79c34343df07b5dd01af2324f72ecc43
+_md5_=c79627f1fa758a8110aecf10d41f7130
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 1b1d8683d114..62e899ffaf5b 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1 b/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1
deleted file mode 100644
index 603ecc1b7dea..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=dev-libs/libappindicator:3 net-im/pidgin[gtk] x11-libs/gtk+:2 dev-perl/XML-Parser dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=AppIndicator/KStatusNotifierItem plugin for Pidgin
-EAPI=7
-HOMEPAGE=https://github.com/philipl/pidgin-indicator
-INHERIT=autotools xdg
-KEYWORDS=amd64 ~riscv
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libappindicator:3 net-im/pidgin[gtk] x11-libs/gtk+:2
-SLOT=0
-SRC_URI=https://github.com/philipl/pidgin-indicator/releases/download/1.0.1/pidgin-indicator-1.0.1.tar.bz2
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=329e68339679c3014beccc9678725a59
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 0710aff09cc6..c6f6325e3cd7 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.4-r1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.4-r1
deleted file mode 100644
index d43e704367b5..000000000000
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.8.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.1
-DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
-EAPI=8
-HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
-INHERIT=cmake
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= dev-qt/qtwayland:5= dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.1
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.8.4.tar.gz -> QGnomePlatform-0.8.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=53fc69534062c5c64c954d9bbb40899f
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0-r1
similarity index 61%
rename from metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0
rename to metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0-r1
index 2646a672328b..15ea9e75f222 100644
--- a/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0-r1
@@ -1,6 +1,6 @@
-BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.2
+DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2
 DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
 EAPI=8
 HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
@@ -8,8 +8,8 @@ INHERIT=cmake
 IUSE=wayland
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) dev-qt/qtx11extras:5= gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3[X] >=x11-themes/adwaita-qt-1.4.2
+RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2
 SLOT=0
 SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.9.0.tar.gz -> QGnomePlatform-0.9.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dda6f7f0ae1828c7ebe4c32dafd392a9
+_md5_=cbdd827a0adc78da47ffc74b2273d69b
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.4.1 b/metadata/md5-cache/x11-themes/adwaita-qt-1.4.1
deleted file mode 100644
index 612454f856b4..000000000000
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-DESCRIPTION=A style to bend Qt applications to look like they belong into GNOME Shell
-EAPI=8
-HOMEPAGE=https://github.com/FedoraQt/adwaita-qt
-INHERIT=cmake
-IUSE=gnome
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-2 LGPL-2
-PDEPEND=gnome? ( x11-themes/QGnomePlatform )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-SLOT=0
-SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.4.1/adwaita-qt-1.4.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=645abcbade77d6d123e41b255022d52d
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
index d6b6a3ceef0f..bd3dbdd37611 100644
--- a/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20230301.tar.gz -> papirus-icon-theme-20230301.tar.gz
 _eclasses_=xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5ca88d96d111ea2ca45eb833092ccb44
+_md5_=2b0ad9dc370f2ddf7e729de5f1dd9136
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 87dad2b0aafa..000e4b58149a 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/garcon-4.19.0 b/metadata/md5-cache/xfce-base/garcon-4.19.0
new file mode 100644
index 000000000000..97362d0f3ef4
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-4.19.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-1.66 )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/garcon/start https://gitlab.xfce.org/xfce/garcon/
+INHERIT=xdg-utils
+IUSE=introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/4.19/garcon-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7d3de4481e4fc0fad2f7c209d2d038df
diff --git a/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
new file mode 100644
index 000000000000..7983da51ed0f
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)] >=xfce-base/xfconf-4.18.0:=
+DESCRIPTION=A tool to find and launch installed applications for the Xfce desktop
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-appfinder/start https://gitlab.xfce.org/xfce/xfce4-appfinder/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 >=xfce-base/garcon-4.18.0:= >=xfce-base/libxfce4util-4.18.0:= >=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)] >=xfce-base/xfconf-4.18.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-appfinder/4.19/xfce4-appfinder-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=72f56833015dfca30fd372e8a4e52fde
diff --git a/metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.0
new file mode 100644
index 000000000000..e12c3a9ca609
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 >=x11-libs/libX11-1.6.7 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.2:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) x11-base/xorg-proto
+DESCRIPTION=Power manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-power-manager/start https://gitlab.xfce.org/xfce/xfce4-power-manager/
+INHERIT=xdg-utils
+IUSE=networkmanager +panel-plugin policykit
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=sys-power/upower-0.99.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libnotify-0.7 >=x11-libs/libX11-1.6.7 >=x11-libs/libXrandr-1.2 x11-libs/libXext x11-libs/libXtst >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.18.2:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-power-manager/4.19/xfce4-power-manager-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c58c73f528f29c9e70d2e4c2c17588e7
diff --git a/metadata/md5-cache/xfce-base/xfce4-session-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-session-4.19.0
new file mode 100644
index 000000000000..d53aa6d65006
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-session-4.19.0
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM >=x11-libs/libwnck-3.10.0:3 >=x11-libs/libX11-1.6.7 >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12.0:= policykit? ( >=sys-auth/polkit-0.102 )
+DESCRIPTION=A session manager for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start https://gitlab.xfce.org/xfce/xfce4-session
+INHERIT=xdg-utils
+IUSE=nls policykit +xscreensaver
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gtk+-3.24.0:3 x11-libs/libSM >=x11-libs/libwnck-3.10.0:3 >=x11-libs/libX11-1.6.7 >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/libxfce4ui-4.18.2:= >=xfce-base/xfconf-4.12.0:= policykit? ( >=sys-auth/polkit-0.102 ) x11-apps/iceauth x11-apps/xrdb nls? ( x11-misc/xdg-user-dirs ) xscreensaver? ( || ( xfce-extra/xfce4-screensaver >=x11-misc/xscreensaver-5.26 x11-misc/light-locker ) )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-session/4.19/xfce4-session-4.19.0.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8b2c5058d08cc3b339dee937cc859eac
diff --git a/metadata/md5-cache/xfce-base/xfce4-settings-4.19.0 b/metadata/md5-cache/xfce-base/xfce4-settings-4.19.0
new file mode 100644
index 000000000000..1e8d520d31a7
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfce4-settings-4.19.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 >=media-libs/fontconfig-2.6.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libX11-1.6.7 >=x11-libs/libXcursor-1.1.0 >=x11-libs/libXi-1.2.0 >=x11-libs/libXrandr-1.2.0 >=xfce-base/garcon-0.1.10:= >=xfce-base/exo-0.11.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13.0:= colord? ( >=x11-misc/colord-1.0.2:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.6.0 ) libnotify? ( >=x11-libs/libnotify-0.1.3 ) upower? ( >=sys-power/upower-0.9.8 ) xklavier? ( >=x11-libs/libxklavier-5.0 ) x11-base/xorg-proto
+DESCRIPTION=Configuration system for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/xfce/xfce4-settings/start https://gitlab.xfce.org/xfce/xfce4-settings/
+INHERIT=python-single-r1 xdg-utils
+IUSE=colord input_devices_libinput libcanberra libnotify upower +xklavier python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-libs/glib-2.66.0 >=media-libs/fontconfig-2.6.0 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/libX11-1.6.7 >=x11-libs/libXcursor-1.1.0 >=x11-libs/libXi-1.2.0 >=x11-libs/libXrandr-1.2.0 >=xfce-base/garcon-0.1.10:= >=xfce-base/exo-0.11.0:= >=xfce-base/libxfce4ui-4.17.0:= >=xfce-base/libxfce4util-4.17.2:= >=xfce-base/xfconf-4.13.0:= colord? ( >=x11-misc/colord-1.0.2:= ) libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.6.0 ) libnotify? ( >=x11-libs/libnotify-0.1.3 ) upower? ( >=sys-power/upower-0.9.8 ) xklavier? ( >=x11-libs/libxklavier-5.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfce4-settings/4.19/xfce4-settings-4.19.0.tar.bz2
+_eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=da1129cc0009cc4fb1e11a4f93ce838f
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 3412d51292e8..580b850eaf48 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5 b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
new file mode 100644
index 000000000000..0084d7d1ef01
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.16.0:3 >=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.14.0:= >=xfce-base/xfce4-panel-4.14.0:=
+DESCRIPTION=A battery monitor panel plugin for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/
+INHERIT=linux-info xdg-utils
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.16.0:3 >=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)] >=xfce-base/libxfce4util-4.14.0:= >=xfce-base/xfce4-panel-4.14.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-1.1.5.tar.bz2
+_eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9bdc692c32158f8cc7b2bb4223eab479
diff --git a/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2 b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
new file mode 100644
index 000000000000..46c81b908846
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 x11-libs/libX11 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.12.0:=
+DESCRIPTION=A calculator plugin for the Xfce4 panel
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-calculator-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.50.0 x11-libs/libX11 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.12.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-calculator-plugin/0.7/xfce4-calculator-plugin-0.7.2.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=761be81ac6a3d959306759464826fd71
diff --git a/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3 b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
new file mode 100644
index 000000000000..a9de7c069bbb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
+DESCRIPTION=A filesystem guard plug-in for the Xfce panel
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.22.0:3 >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xfce4-fsguard-plugin-1.1.3.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6be434d148537a127dc0ed3fae12a9bd
diff --git a/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.2 b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.2
new file mode 100644
index 000000000000..1de89dafb843
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.20.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.10.0:=
+DESCRIPTION=A simple timer plug-in for the Xfce desktop environment
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/
+INHERIT=xdg-utils
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26.0 >=x11-libs/gtk+-3.20.0:3 >=xfce-base/libxfce4ui-4.12.0:= >=xfce-base/libxfce4util-4.12.0:= >=xfce-base/xfce4-panel-4.10.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-1.7.2.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=de123874cab9f7066d995af1e12a4f7f
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8c0d7efade2c..04676501a45b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-18T11:39:53Z
+TIMESTAMP 2023-04-20T18:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ+gYpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRBf/FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDMvxAAncpSpJgpHKPifJg8Jr9vh77O7q+okvMEtqUe4HcJvWwqzUU0OifreFTl
-+L0Y517DWre+XyM9j47Ws6gf2zNPkpw7TPVtkWBx+4NlB+EKdEESfzmMN5e6r8dH
-9NHOpSTaUl8uU1UC1dZtYAWewHBVA4+OFKoOcP/QzVBfsltcxlgxS3VkW5hdT3ZC
-dSVidx6wsMCGCCqYobFJgObiPaPiSexws3qGy/5fKWmPT5vRZgDWxydtIESJCrui
-Z4bCOio6Y7dzUvU1Fsjp58wmutZKnylzDd5AVwqyOtomp9C0hZWk8ZG9XnAIswHL
-O7cG32SItsQvwKg5qUrORL4ST5e1/+etRZT044W4vzvOKyK62+QhCDt1xIZCqAUA
-l7wf2EtEeQR/t2gGcSX7h9THhorlzIK2z4hhjkPuFImxZkrnT6Ya6p6YhzbGRphk
-HYQqyZh5ikzFklD4PwxvUeO3jMqeHs3hcO4Bv7/WQeQD75ZTu2NWKWneeQ6SyV+K
-QAWg1BjeggwVNVk5Nj/IPmTcIt4rJ6EyTBiwi3ACgT+SLD65nrMcN45bv4fLfDX2
-KYNItxmx/9WMCoVGUWdQNSkoZtSyg38ORWPj6Gc9hhUM2VNXXkEJS6qYE5LohRQy
-KpjBiBtcny4LmIVBvygQZboHZ5ACDXG6iZj5EByNVSfH3IQdGKY=
-=J3JV
+klDWnA/8DlTtJZt6pC7/8gD+A07GN8v8fWWybNlJVGABV9pB/ZeS6hRyWbmtq7ZS
+ZRHGzW8yoV2zeY5zoPGRRXexTZ9SgsGe2Gl8MvBcWrt9HJRA+t4oa3Qi6EdSZfYZ
+ftA9O/dEv9IxlVTvb/A8X2AowY/PFUpc1sMaStas25SnEwIuvB0LwkdPkdGPBCpq
+vuM7mHwwcbiu82o2i31ecCkKo2mNWXLwutyf71emRElYTkyjd4rJdmSYcD01NpFs
+1uchdZ59VNjN+LxpNGhcOxBI9MoGovdvEH6b7gfqpyos2lHIsD55yy63tZwCfte4
+zP1rosw7HFdu0jbdqU+8KDFM1QZzGuY2Q8cPrm5RRpM8PMADXFu1uunwFvH6P6d4
+duHwqdj+NLAT6Ynf5Jz9PTAv6cX+P4HNlZrxrVfduz0noku/ADVWw7klFWrJnyWB
+QaEQ25Hj6kCfmBIvK3FZ3GflBcY1wV9e4DcLYVTfpzWuuKGfQ6pKEmxhXlH/c2PY
+qjTP5m/9mK82yIWEWSXq4FZ3eCF6TrNNRAJ94VYBKYEtNfHgZgEb3IK4aXB99MEE
+NJYv2eMMZubukarxyjdbovjn48UhraKEJxqkW4PL/O5Obuzt5MxfY23WDldmJ3Jr
+5s3NBPK9QJ9WCklJK8dT0c6CAvXPnZLu6z8F0kcxjJWiFkCN0CE=
+=IwSR
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f89790580ce7..beb32d4cd6b1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Apr 2023 11:39:51 +0000
+Thu, 20 Apr 2023 18:09:50 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index e59d639d991d..3c6bf2ff6cff 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3191,6 +3191,10 @@
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
     </member>
+    <member>
+      <email>ulm@gentoo.org</email>
+      <name>Ulrich Müller</name>
+    </member>
     <member>
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 2a445fef40ef..4fd2a1e634af 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Apr 18 11:39:51 AM UTC 2023
+Thu Apr 20 06:09:50 PM UTC 2023
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 4bfd6809183c..0b220194cd9f 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -939,6 +939,7 @@
 2212240610 ./app-accessibility/sound-icons/sound-icons-0.1.ebuild
 2301141613 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
 2302140240 ./app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
+2304190610 ./app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild
 2012231444 ./app-accessibility/speechd-el/speechd-el-2.8.ebuild
 2208201110 ./app-accessibility/speechd-el/speechd-el-2.11.ebuild
 1811120209 ./app-accessibility/sphinx2/sphinx2-0.6.ebuild
@@ -975,6 +976,7 @@
 2304140640 ./app-admin/awscli/awscli-1.27.113.ebuild
 2304150840 ./app-admin/awscli/awscli-1.27.114.ebuild
 2304180610 ./app-admin/awscli/awscli-1.27.115.ebuild
+2304200540 ./app-admin/awscli/awscli-1.27.116.ebuild
 2301080710 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.12.0.ebuild
 2303250740 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2023.2.0.ebuild
 2303182340 ./app-admin/calamares/calamares-3.2.60-r1.ebuild
@@ -1176,6 +1178,7 @@
 2302270310 ./app-admin/rsyslog/rsyslog-8.2208.0-r2.ebuild
 2302270310 ./app-admin/rsyslog/rsyslog-8.2210.0-r2.ebuild
 2304040110 ./app-admin/rsyslog/rsyslog-8.2302.0.ebuild
+2304200511 ./app-admin/rsyslog/rsyslog-8.2304.0.ebuild
 2207031410 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
 2211080810 ./app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
 2109150109 ./app-admin/ryzen_smu/ryzen_smu-0.1.2.ebuild
@@ -1206,7 +1209,7 @@
 2110121039 ./app-admin/sshguard/sshguard-2.4.2.ebuild
 2102151309 ./app-admin/sshguard/sshguard-99999.ebuild
 2204090539 ./app-admin/stow/stow-2.3.1.ebuild
-2203200240 ./app-admin/su-exec/su-exec-0.2.ebuild
+2304181710 ./app-admin/su-exec/su-exec-0.2.ebuild
 2212241610 ./app-admin/sud/sud-1.3-r2.ebuild
 2211060710 ./app-admin/sudo/sudo-9999.ebuild
 2301201010 ./app-admin/sudo/sudo-1.9.12_p2.ebuild
@@ -1220,7 +1223,7 @@
 2209281010 ./app-admin/sysklogd/sysklogd-2.4.4.ebuild
 2301141613 ./app-admin/syslog-ng/syslog-ng-3.38.1.ebuild
 2304181340 ./app-admin/syslog-ng/syslog-ng-4.0.1.ebuild
-2304171910 ./app-admin/syslog-ng/syslog-ng-4.1.1.ebuild
+2304190940 ./app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
 2302271540 ./app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
 2106302209 ./app-admin/sysrqd/sysrqd-17-r2.ebuild
 2304012310 ./app-admin/sysstat/sysstat-12.6.2.ebuild
@@ -1269,8 +1272,7 @@
 2303290040 ./app-admin/ansible-core/ansible-core-2.14.3.ebuild
 2304090610 ./app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
 2304090610 ./app-admin/ansible-core/ansible-core-9999.ebuild
-2301141613 ./app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
-2302252040 ./app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
+2304191540 ./app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
 2212301610 ./app-admin/coreboot-utils/coreboot-utils-4.18-r2.ebuild
 2301131610 ./app-antivirus/clamav/clamav-0.103.7-r1.ebuild
 2302170840 ./app-antivirus/clamav/clamav-1.0.1.ebuild
@@ -1392,8 +1394,8 @@
 2301152340 ./app-arch/upx/upx-4.0.1-r1.ebuild
 2302220940 ./app-arch/upx/upx-4.0.2.ebuild
 2303162210 ./app-arch/vimball/vimball-0.5.1.ebuild
-2304091940 ./app-arch/vimball/vimball-0.5.1-r1.ebuild
 2304091940 ./app-arch/vimball/vimball-9999.ebuild
+2304191440 ./app-arch/vimball/vimball-0.5.1-r1.ebuild
 2112052139 ./app-arch/wimlib/wimlib-1.13.4-r1.ebuild
 2211270610 ./app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
 2212311540 ./app-arch/xarchiver/xarchiver-0.5.4.20.ebuild
@@ -1447,7 +1449,7 @@
 2303271710 ./app-backup/btrbk/btrbk-0.32.6.ebuild
 2212031140 ./app-backup/burp/burp-2.4.0-r2.ebuild
 2212242140 ./app-backup/burp/burp-3.1.2.ebuild
-2212241010 ./app-backup/burp/burp-3.1.4.ebuild
+2304190440 ./app-backup/burp/burp-3.1.4.ebuild
 2012311940 ./app-backup/ccollect/ccollect-0.8.ebuild
 1807151809 ./app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
 2106300039 ./app-backup/cdbkup/cdbkup-1.0-r4.ebuild
@@ -1497,8 +1499,7 @@
 2304071540 ./app-backup/tsm/tsm-8.1.13.3.ebuild
 2304071540 ./app-backup/tsm/tsm-8.1.15.0.ebuild
 2304071540 ./app-backup/tsm/tsm-8.1.17.2.ebuild
-2301141613 ./app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
-2302252040 ./app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
+2304191540 ./app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
 2207030210 ./app-backup/vzdump/vzdump-1.2-r1.ebuild
 2104020239 ./app-benchmarks/bashmark/bashmark-0.6.2.ebuild
 2109012139 ./app-benchmarks/bonnie++/bonnie++-2.00a.ebuild
@@ -1532,7 +1533,7 @@
 2205061840 ./app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
 2112052209 ./app-benchmarks/siege/siege-4.1.0.ebuild
 2302242310 ./app-benchmarks/siege/siege-4.1.6.ebuild
-2303200140 ./app-benchmarks/stress-ng/stress-ng-0.15.06.ebuild
+2304190010 ./app-benchmarks/stress-ng/stress-ng-0.15.07.ebuild
 2303041140 ./app-benchmarks/stress/stress-1.0.7.ebuild
 2301141613 ./app-benchmarks/sysbench/sysbench-1.0.20-r101.ebuild
 2204292240 ./app-benchmarks/tiobench/tiobench-0.5.0.ebuild
@@ -1628,7 +1629,7 @@
 2211110710 ./app-crypt/chntpw/chntpw-140201-r1.ebuild
 2207210140 ./app-crypt/ckpass/ckpass-0.2-r2.ebuild
 2203130939 ./app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
-1712281509 ./app-crypt/codegroup/codegroup-20080907-r1.ebuild
+2304182240 ./app-crypt/codegroup/codegroup-20080907-r1.ebuild
 2210141510 ./app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
 2104200439 ./app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
 2201281110 ./app-crypt/crackpkcs12/crackpkcs12-0.2.11.ebuild
@@ -1654,7 +1655,7 @@
 2303071540 ./app-crypt/gcr/gcr-3.41.1-r2.ebuild
 2303300710 ./app-crypt/gcr/gcr-4.1.0.ebuild
 2109141739 ./app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
-1908151239 ./app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
+2304181710 ./app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
 2303091110 ./app-crypt/glep63-check/glep63-check-10.ebuild
 2303091110 ./app-crypt/glep63-check/glep63-check-11.ebuild
 2105022039 ./app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
@@ -2062,6 +2063,8 @@
 2301032140 ./app-doc/jargon/jargon-4.4.7-r2.ebuild
 2302090310 ./app-doc/kicad-doc/kicad-doc-6.0.9.ebuild
 2302170840 ./app-doc/kicad-doc/kicad-doc-7.0.0.ebuild
+2304192110 ./app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
+2304192110 ./app-doc/kicad-doc/kicad-doc-7.0.1.ebuild
 2112210709 ./app-doc/lapack-docs/lapack-docs-3.1.1.ebuild
 2112121739 ./app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
 2202140039 ./app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild
@@ -2214,7 +2217,7 @@
 2201302309 ./app-editors/jed/jed-0.99.19-r1.ebuild
 2201291040 ./app-editors/jedit/jedit-5.4.0-r2.ebuild
 2304091010 ./app-editors/jedit/jedit-5.6.0.ebuild
-2212020410 ./app-editors/joe/joe-4.6-r2.ebuild
+2304191140 ./app-editors/joe/joe-4.6-r2.ebuild
 1909051109 ./app-editors/jove/jove-4.16.0.73-r1.ebuild
 2202152209 ./app-editors/jove/jove-4.17.3.7.ebuild
 2108021009 ./app-editors/juffed/juffed-0.10_p20200103.ebuild
@@ -2249,7 +2252,7 @@
 2301141613 ./app-editors/pluma/pluma-1.26.0.ebuild
 2304110610 ./app-editors/pluma/pluma-1.26.0-r1.ebuild
 2302212110 ./app-editors/pyvim/pyvim-3.0.2.ebuild
-2302212110 ./app-editors/pyvim/pyvim-3.0.3.ebuild
+2304191440 ./app-editors/pyvim/pyvim-3.0.3.ebuild
 2110291639 ./app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
 2303091210 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
 2110291639 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
@@ -2535,6 +2538,7 @@
 2303262010 ./app-emacs/org-mode/org-mode-9999.ebuild
 2303280410 ./app-emacs/org-mode/org-mode-9.6.2.ebuild
 2304040440 ./app-emacs/org-mode/org-mode-9.6.3.ebuild
+2304190010 ./app-emacs/org-mode/org-mode-9.6.4.ebuild
 2104122109 ./app-emacs/outline-magic/outline-magic-0.9.ebuild
 2104122109 ./app-emacs/paredit/paredit-24.ebuild
 2211261740 ./app-emacs/paredit/paredit-25.ebuild
@@ -2662,9 +2666,9 @@
 2202140009 ./app-emacs/yatex/yatex-1.82.ebuild
 1910022239 ./app-emacs/zenburn/zenburn-20110907-r1.ebuild
 2103282309 ./app-emacs/zenirc/zenirc-2.112-r1.ebuild
-2303262010 ./app-emacs/projectile/projectile-2.5.0-r1.ebuild
-2303262010 ./app-emacs/projectile/projectile-2.6.0.ebuild
-2303262010 ./app-emacs/projectile/projectile-2.7.0.ebuild
+2304200310 ./app-emacs/projectile/projectile-2.5.0-r1.ebuild
+2304200310 ./app-emacs/projectile/projectile-2.6.0.ebuild
+2304201540 ./app-emacs/projectile/projectile-2.7.0.ebuild
 2303262010 ./app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
 2303262010 ./app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
 2303262010 ./app-emacs/lean-mode/lean-mode-20220501.ebuild
@@ -2682,6 +2686,7 @@
 2303262010 ./app-emacs/hl-todo/hl-todo-3.4.2.ebuild
 2302191840 ./app-emacs/marginalia/marginalia-1.0-r1.ebuild
 2302191840 ./app-emacs/marginalia/marginalia-1.1.ebuild
+2304190010 ./app-emacs/marginalia/marginalia-1.2.ebuild
 2202271339 ./app-emacs/orderless/orderless-0.7.ebuild
 2212200140 ./app-emacs/orderless/orderless-0.8.ebuild
 2212270513 ./app-emacs/orderless/orderless-1.0.ebuild
@@ -2700,10 +2705,10 @@
 2212080040 ./app-emacs/company-math/company-math-1.5.ebuild
 2212281840 ./app-emacs/company-math/company-math-1.5.1.ebuild
 2203060610 ./app-emacs/math-symbol-lists/math-symbol-lists-1.3.ebuild
-2303262010 ./app-emacs/buttercup/buttercup-1.26.ebuild
 2303262010 ./app-emacs/buttercup/buttercup-1.28.ebuild
 2303262010 ./app-emacs/buttercup/buttercup-1.29.ebuild
 2303312040 ./app-emacs/buttercup/buttercup-1.30.ebuild
+2304190010 ./app-emacs/buttercup/buttercup-1.31.ebuild
 2301302340 ./app-emacs/boogie-friends/boogie-friends-0.1_p20210703.ebuild
 2301302340 ./app-emacs/boogie-friends/boogie-friends-0.1_p20220922.ebuild
 2303262010 ./app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
@@ -2736,7 +2741,7 @@
 2303262010 ./app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild
 2303262010 ./app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild
 2303262010 ./app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.8.0.ebuild
-2303262010 ./app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
+2304200740 ./app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
 2303262010 ./app-emacs/all-the-icons/all-the-icons-5.0.0-r1.ebuild
 2303262010 ./app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
 2304030340 ./app-emacs/all-the-icons/all-the-icons-5.0.0_p20230316.ebuild
@@ -2892,9 +2897,9 @@
 2301250310 ./app-emacs/geiser-gambit/geiser-gambit-0.18.1.ebuild
 2303262010 ./app-emacs/emacs-ccls/emacs-ccls-0_pre20220510-r1.ebuild
 2303262010 ./app-emacs/emacs-ccls/emacs-ccls-0_pre20230311.ebuild
-2303191740 ./app-emacs/citar/citar-1.2.0.ebuild
 2303280410 ./app-emacs/citar/citar-1.3.1.ebuild
 2304042340 ./app-emacs/citar/citar-1.1.ebuild
+2304200740 ./app-emacs/citar/citar-1.2.0.ebuild
 2208101710 ./app-emacs/citeproc-el/citeproc-el-0.9.1.ebuild
 2212211810 ./app-emacs/citeproc-el/citeproc-el-0.9.2.ebuild
 2304042340 ./app-emacs/citeproc-el/citeproc-el-0.9.3.ebuild
@@ -2950,14 +2955,15 @@
 2303262010 ./app-emacs/emacs-websearch/emacs-websearch-9999.ebuild
 2212200140 ./app-emacs/engrave-faces/engrave-faces-0.3.1.ebuild
 2301050511 ./app-emacs/crux/crux-0.4.0.ebuild
-2301142010 ./app-emacs/osm/osm-0.9.ebuild
 2304020511 ./app-emacs/osm/osm-0.10.ebuild
+2304190010 ./app-emacs/osm/osm-0.11.ebuild
 2301142010 ./app-emacs/tempel/tempel-0.6.ebuild
 2302171540 ./app-emacs/tempel/tempel-0.7.ebuild
 2303262010 ./app-emacs/centaur-tabs/centaur-tabs-3.2.ebuild
 2301302340 ./app-emacs/powerline/powerline-2.5_p20221110.ebuild
 2304180340 ./app-emacs/doom-modeline/doom-modeline-3.3.2.ebuild
-2303262010 ./app-emacs/shrink-path/shrink-path-0.3.1.ebuild
+2304200310 ./app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
+2304200310 ./app-emacs/shrink-path/shrink-path-0.3.1.ebuild
 2303262010 ./app-emacs/poke-mode/poke-mode-3.0.ebuild
 2303262010 ./app-emacs/poke/poke-3.0.ebuild
 2301300040 ./app-emacs/reazon/reazon-0.4.1.ebuild
@@ -2983,6 +2989,7 @@
 2011072239 ./app-emulation/coldfire/coldfire-0.3.1.ebuild
 2301141613 ./app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild
 2302241740 ./app-emulation/crossover-bin/crossover-bin-22.1.0.ebuild
+2304181840 ./app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild
 2204031409 ./app-emulation/dinero/dinero-4.7-r1.ebuild
 2303171840 ./app-emulation/diskimage-builder/diskimage-builder-3.26.0.ebuild
 2303171840 ./app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -3118,6 +3125,7 @@
 2304111510 ./app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
 2304150110 ./app-emulation/wine-vanilla/wine-vanilla-8.6.ebuild
 2304180040 ./app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+2304201940 ./app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
 2205231010 ./app-emulation/winetricks/winetricks-20220411.ebuild
 2302121610 ./app-emulation/winetricks/winetricks-20230212.ebuild
 2302121610 ./app-emulation/winetricks/winetricks-99999999.ebuild
@@ -3127,8 +3135,8 @@
 2301141613 ./app-emulation/xen-tools/xen-tools-4.15.4-r1.ebuild
 2301251940 ./app-emulation/xen-tools/xen-tools-4.16.3.ebuild
 2304172340 ./app-emulation/xen-tools/xen-tools-4.15.5_pre1.ebuild
-2304171140 ./app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
-2304171140 ./app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
+2304190940 ./app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
+2304190940 ./app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
 2301141613 ./app-emulation/xen/xen-4.15.4.ebuild
 2301251940 ./app-emulation/xen/xen-4.16.3.ebuild
 2304172340 ./app-emulation/xen/xen-4.15.5_pre1.ebuild
@@ -3138,11 +3146,11 @@
 2302100210 ./app-emulation/ruffle/ruffle-9999.ebuild
 2303281110 ./app-emulation/ruffle/ruffle-0_p20230328.ebuild
 2211290110 ./app-emulation/86Box/86Box-3.11.ebuild
-2212160040 ./app-emulation/dxvk/dxvk-1.10.3.ebuild
-2212142010 ./app-emulation/dxvk/dxvk-2.0.ebuild
 2301250110 ./app-emulation/dxvk/dxvk-9999.ebuild
-2302131510 ./app-emulation/dxvk/dxvk-2.1.ebuild
-2304180010 ./app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
+2304190740 ./app-emulation/dxvk/dxvk-1.10.3.ebuild
+2304190740 ./app-emulation/dxvk/dxvk-2.0.ebuild
+2304190740 ./app-emulation/dxvk/dxvk-2.1.ebuild
+2304190740 ./app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
 2212020640 ./app-emulation/vkd3d-proton/vkd3d-proton-9999.ebuild
 2212160040 ./app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
 2212292340 ./app-emulation/vkd3d-proton/vkd3d-proton-2.8.ebuild
@@ -3157,8 +3165,11 @@
 2304180010 ./app-emulation/wine-proton/wine-proton-7.0.6.ebuild
 2304180010 ./app-emulation/wine-proton/wine-proton-7.0.9999.ebuild
 2304180010 ./app-emulation/wine-proton/wine-proton-8.0.1c.ebuild
+2304190810 ./app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
 2304171810 ./app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild
 2304171810 ./app-emulation/virtiofsd/virtiofsd-9999.ebuild
+2304191840 ./app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild
+2304191840 ./app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild
 2107211409 ./app-eselect/eselect-blas/eselect-blas-0.1.ebuild
 2205140940 ./app-eselect/eselect-blas/eselect-blas-0.2.ebuild
 2303190111 ./app-eselect/eselect-blas/eselect-blas-0.3.ebuild
@@ -3208,7 +3219,7 @@
 2211220410 ./app-eselect/eselect-vi/eselect-vi-20221122.ebuild
 2303030840 ./app-eselect/eselect-wine/eselect-wine-2.0.2.ebuild
 2212042040 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
-2302100810 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
+2304191440 ./app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
 2303091610 ./app-eselect/eselect-zig/eselect-zig-1-r1.ebuild
 2301141613 ./app-forensics/afflib/afflib-3.7.19-r1.ebuild
 2304082110 ./app-forensics/afflib/afflib-3.7.20.ebuild
@@ -3621,7 +3632,7 @@
 2205150210 ./app-misc/g15stats/g15stats-3.0.3.ebuild
 2205150210 ./app-misc/g15stats/g15stats-9999.ebuild
 2104161439 ./app-misc/g810-led/g810-led-0.3.6.ebuild
-2104161439 ./app-misc/g810-led/g810-led-0.4.2.ebuild
+2304181640 ./app-misc/g810-led/g810-led-0.4.2.ebuild
 2301040740 ./app-misc/gcal/gcal-4.1-r1.ebuild
 2106071139 ./app-misc/geekcode/geekcode-1.7.3-r1.ebuild
 2206261710 ./app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -3698,7 +3709,7 @@
 2304162310 ./app-misc/linuxspa/linuxspa-0.7.1-r2.ebuild
 2301141613 ./app-misc/lirc/lirc-0.10.1-r4.ebuild
 2301141613 ./app-misc/lirc/lirc-0.10.1_p7.ebuild
-2302271740 ./app-misc/lirc/lirc-0.10.2.ebuild
+2304191310 ./app-misc/lirc/lirc-0.10.2.ebuild
 2210010410 ./app-misc/livecd-tools/livecd-tools-2.10.ebuild
 2210010410 ./app-misc/livecd-tools/livecd-tools-2.9.ebuild
 2210010410 ./app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -3710,8 +3721,7 @@
 2302050240 ./app-misc/mc/mc-4.8.28-r2.ebuild
 2302050240 ./app-misc/mc/mc-9999.ebuild
 2303241840 ./app-misc/mc/mc-4.8.29.ebuild
-2301141613 ./app-misc/media-player-info/media-player-info-24.ebuild
-2302251340 ./app-misc/media-player-info/media-player-info-24-r1.ebuild
+2304190440 ./app-misc/media-player-info/media-player-info-24-r1.ebuild
 2207182110 ./app-misc/mencal/mencal-3.0-r1.ebuild
 2207312310 ./app-misc/mepl/mepl-0.45-r2.ebuild
 2204290540 ./app-misc/mime-types/mime-types-2.1.53.ebuild
@@ -3742,8 +3752,8 @@
 2302262240 ./app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0.8.ebuild
 2302262240 ./app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0.8.ebuild
 2302262240 ./app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0.8.ebuild
-2301051740 ./app-misc/openrgb/openrgb-9999.ebuild
-2303290240 ./app-misc/openrgb/openrgb-0.8-r1.ebuild
+2304201410 ./app-misc/openrgb/openrgb-0.8-r1.ebuild
+2304201410 ./app-misc/openrgb/openrgb-9999.ebuild
 2101061639 ./app-misc/pal/pal-0.4.3-r2.ebuild
 2301100010 ./app-misc/pax-utils/pax-utils-9999.ebuild
 2301141613 ./app-misc/pax-utils/pax-utils-1.3.5.ebuild
@@ -3792,7 +3802,7 @@
 2301141613 ./app-misc/resolve-march-native/resolve-march-native-1.0.0-r1.ebuild
 2301141613 ./app-misc/resolve-march-native/resolve-march-native-2.1.0-r1.ebuild
 2301141613 ./app-misc/resolve-march-native/resolve-march-native-2.1.0.ebuild
-2303200240 ./app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
+2304200810 ./app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
 2202100210 ./app-misc/rioutil/rioutil-1.5.4-r1.ebuild
 2207312310 ./app-misc/rl/rl-0.2.7-r2.ebuild
 2201201609 ./app-misc/rlwrap/rlwrap-0.45.2-r1.ebuild
@@ -4004,7 +4014,6 @@
 2303250940 ./app-office/texstudio/texstudio-4.3.1-r1.ebuild
 2301141613 ./app-office/unoconv/unoconv-0.9.0-r1.ebuild
 1612040405 ./app-office/worklog-assistant-bin/worklog-assistant-bin-2.1.3580.ebuild
-2212161910 ./app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild
 2302241740 ./app-office/wps-office/wps-office-11.1.0.11691.ebuild
 2304012010 ./app-office/kalendar/kalendar-22.12.3.ebuild
 2212052315 ./app-office/sc-im/sc-im-0.8.2.ebuild
@@ -4043,8 +4052,8 @@
 2301211010 ./app-portage/elicense/elicense-1.0.2.ebuild
 2301141613 ./app-portage/elogv/elogv-0.7.9-r1.ebuild
 2301141613 ./app-portage/elogv/elogv-0.7.9-r2.ebuild
-2301141613 ./app-portage/elogv/elogv-0.7.9-r3.ebuild
 2301141613 ./app-portage/elogv/elogv-0.7.9.ebuild
+2304200810 ./app-portage/elogv/elogv-0.7.9-r3.ebuild
 2303051840 ./app-portage/elogviewer/elogviewer-3.2.ebuild
 2211040140 ./app-portage/elt-patches/elt-patches-20220831.ebuild
 2301282240 ./app-portage/elt-patches/elt-patches-20221210.ebuild
@@ -4059,7 +4068,7 @@
 2303162210 ./app-portage/fetchcommandwrapper/fetchcommandwrapper-0.8.4-r3.ebuild
 2301141613 ./app-portage/flaggie/flaggie-0.2.1-r2.ebuild
 2301311540 ./app-portage/flaggie/flaggie-0.99.2.ebuild
-2302152010 ./app-portage/flaggie/flaggie-0.99.3.ebuild
+2304191310 ./app-portage/flaggie/flaggie-0.99.3.ebuild
 2012311940 ./app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
 2004110239 ./app-portage/g-cpan/g-cpan-0.17.0.ebuild
 2207041010 ./app-portage/g-cpan/g-cpan-0.18.0-r1.ebuild
@@ -4099,7 +4108,7 @@
 2301141613 ./app-portage/metagen/metagen-0.7.3-r1.ebuild
 2301141613 ./app-portage/metagen/metagen-0.7.3.ebuild
 2301141613 ./app-portage/metagen/metagen-9999.ebuild
-2303162210 ./app-portage/metagen/metagen-0.7.3-r2.ebuild
+2304200740 ./app-portage/metagen/metagen-0.7.3-r2.ebuild
 2304082010 ./app-portage/mgorny-dev-scripts/mgorny-dev-scripts-37.ebuild
 2301141613 ./app-portage/mirrorselect/mirrorselect-2.2.6-r2.ebuild
 2301141613 ./app-portage/mirrorselect/mirrorselect-2.3.0-r1.ebuild
@@ -4114,7 +4123,7 @@
 2010031009 ./app-portage/pgo/pgo-0.0.3.ebuild
 2009011409 ./app-portage/pgo/pgo-9999.ebuild
 2301141613 ./app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
-2303022110 ./app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
+2304190610 ./app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
 2208290110 ./app-portage/portage-utils/portage-utils-9999.ebuild
 2212061140 ./app-portage/portage-utils/portage-utils-0.94.4.ebuild
 2212161110 ./app-portage/portage-utils/portage-utils-0.94.3.ebuild
@@ -4351,14 +4360,14 @@
 2304030910 ./app-text/groonga/groonga-8.0.2-r2.ebuild
 2304101240 ./app-text/groonga/groonga-13.0.1.ebuild
 2112142339 ./app-text/grutatxt/grutatxt-2.200.0.ebuild
-2303090440 ./app-text/gspell/gspell-1.12.0.ebuild
+2304191210 ./app-text/gspell/gspell-1.12.0.ebuild
 2212022210 ./app-text/gtkspell/gtkspell-3.0.10-r1.ebuild
 2212050840 ./app-text/gtkspell/gtkspell-2.0.16-r2.ebuild
 2212171010 ./app-text/gtranslator/gtranslator-42.0.ebuild
 2209010410 ./app-text/gv/gv-3.7.3.90-r1.ebuild
 2301132040 ./app-text/gv/gv-3.7.4.ebuild
 2012311940 ./app-text/hd2u/hd2u-1.0.3.ebuild
-2304181210 ./app-text/highlight/highlight-4.1.ebuild
+2304191610 ./app-text/highlight/highlight-4.1.ebuild
 2011272109 ./app-text/hnb/hnb-1.9.18-r1.ebuild
 2111292209 ./app-text/htag/htag-0.0.24-r1.ebuild
 2208292240 ./app-text/html-xml-utils/html-xml-utils-7.8-r1.ebuild
@@ -4592,7 +4601,7 @@
 2304022040 ./app-text/xapers/xapers-0.9.0.ebuild
 2210282210 ./app-text/xapian-omega/xapian-omega-1.4.19.ebuild
 2301292040 ./app-text/xapian-omega/xapian-omega-1.4.21.ebuild
-2304021310 ./app-text/xapian-omega/xapian-omega-1.4.22.ebuild
+2304201610 ./app-text/xapian-omega/xapian-omega-1.4.22.ebuild
 2202241609 ./app-text/xchm/xchm-1.33.ebuild
 2303312009 ./app-text/xchm/xchm-1.35.ebuild
 2212081110 ./app-text/xdvik/xdvik-22.87.03-r4.ebuild
@@ -4640,8 +4649,8 @@
 2206021510 ./app-text/zathura/zathura-0.4.9.ebuild
 2301090040 ./app-text/zathura/zathura-9999.ebuild
 2303071510 ./app-text/zathura/zathura-0.5.2-r4.ebuild
-2302231110 ./app-text/zotero-bin/zotero-bin-6.0.22.ebuild
 2303151710 ./app-text/zotero-bin/zotero-bin-6.0.23.ebuild
+2304192010 ./app-text/zotero-bin/zotero-bin-6.0.25.ebuild
 2303250640 ./app-text/mdbook/mdbook-0.4.28.ebuild
 2205062310 ./app-text/App-XML-DocBook-Builder/App-XML-DocBook-Builder-0.100.300-r1.ebuild
 2303281940 ./app-text/ronn-ng/ronn-ng-0.9.1-r2.ebuild
@@ -4660,9 +4669,10 @@
 2303161510 ./app-text/xml2rfc/xml2rfc-3.16.0.ebuild
 2303161510 ./app-text/xml2rfc/xml2rfc-3.17.0.ebuild
 2303172140 ./app-text/crengine-ng/crengine-ng-0.9.7.ebuild
+2304201310 ./app-text/crengine-ng/crengine-ng-0.9.8.ebuild
 2303172140 ./app-text/crqt-ng/crqt-ng-1.0.9.ebuild
-2304070640 ./app-text/crqt-ng/crqt-ng-1.0.11.ebuild
-2301031410 ./app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild
+2304201310 ./app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
+2304201310 ./app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
 2106042109 ./app-vim/Vim-Jinja2-Syntax/Vim-Jinja2-Syntax-0.0_pre20210604.ebuild
 1710270027 ./app-vim/ackvim/ackvim-1.0.9-r1.ebuild
 2301130240 ./app-vim/ackvim/ackvim-1.0.9-r2.ebuild
@@ -5049,6 +5059,7 @@
 2301141613 ./dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
 2301141613 ./dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild
 2304181440 ./dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
+2304182110 ./dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild
 2009281609 ./dev-cpp/aixlog/aixlog-9999.ebuild
 2210031810 ./dev-cpp/aixlog/aixlog-1.5.0.ebuild
 2210260140 ./dev-cpp/amqp-cpp/amqp-cpp-4.3.18.ebuild
@@ -5096,7 +5107,6 @@
 2301291410 ./dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
 2303090240 ./dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.14.ebuild
 2208280840 ./dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
-2212240010 ./dev-cpp/json11/json11-1.0.0.ebuild
 2304051710 ./dev-cpp/json11/json11-1.0.0-r1.ebuild
 2205161140 ./dev-cpp/kokkos/kokkos-3.1.01-r1.ebuild
 2212052040 ./dev-cpp/kokkos/kokkos-3.7.0.ebuild
@@ -5182,13 +5192,14 @@
 2212121740 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.2.ebuild
 2304150010 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.4.ebuild
 2304181010 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.2.ebuild
-2302080240 ./dev-cpp/cpp-httplib/cpp-httplib-0.11.3.ebuild
+2304190840 ./dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.11.3.ebuild
 2302201240 ./dev-cpp/cpp-httplib/cpp-httplib-0.11.4.ebuild
-2303141110 ./dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
-2304180910 ./dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
+2304200511 ./dev-cpp/cpp-httplib/cpp-httplib-0.12.0.ebuild
+2304200511 ./dev-cpp/cpp-httplib/cpp-httplib-0.12.1.ebuild
+2304201410 ./dev-cpp/cpp-httplib/cpp-httplib-0.12.2.ebuild
 2301080810 ./dev-cpp/magic_enum/magic_enum-0.8.2.ebuild
 2302071310 ./dev-cpp/msgpack-cxx/msgpack-cxx-5.0.0.ebuild
-2303310210 ./dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
+2304181740 ./dev-cpp/msgpack-cxx/msgpack-cxx-6.0.0.ebuild
 2303260540 ./dev-cpp/curlpp/curlpp-0.8.1.ebuild
 2303030240 ./dev-cpp/cctz/cctz-2.3_p20230228.ebuild
 2110040939 ./dev-db/apgdiff/apgdiff-2.7.0.ebuild
@@ -5240,9 +5251,9 @@
 2304140710 ./dev-db/mariadb/mariadb-10.6.11-r4.ebuild
 2304140710 ./dev-db/mariadb/mariadb-10.6.12-r1.ebuild
 2301141613 ./dev-db/mongodb/mongodb-4.4.10-r1.ebuild
-2301141613 ./dev-db/mongodb/mongodb-4.4.8-r1.ebuild
 2301300640 ./dev-db/mongodb/mongodb-5.0.5-r2.ebuild
-2303311510 ./dev-db/mongodb/mongodb-4.4.8-r2.ebuild
+2304201840 ./dev-db/mongodb/mongodb-4.4.20.ebuild
+2304201740 ./dev-db/mongodb/mongodb-5.0.16-r1.ebuild
 2302260140 ./dev-db/mycli/mycli-1.26.1.ebuild
 2302260140 ./dev-db/mycli/mycli-9999.ebuild
 2210252110 ./dev-db/mydumper/mydumper-0.12.5.3.ebuild
@@ -5277,9 +5288,9 @@
 2207022141 ./dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild
 2304181340 ./dev-db/percona-toolkit/percona-toolkit-3.5.1.ebuild
 1912312209 ./dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
-2109292009 ./dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
 2206191310 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.26.18.ebuild
-2304181140 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
+2304190440 ./dev-db/percona-xtrabackup/percona-xtrabackup-2.4.24.ebuild
+2304190440 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.30.23.ebuild
 2103041839 ./dev-db/pgFormatter/pgFormatter-5.0.ebuild
 2109281639 ./dev-db/pgFormatter/pgFormatter-5.1.ebuild
 2303131910 ./dev-db/pg_activity/pg_activity-3.1.1.ebuild
@@ -5366,8 +5377,8 @@
 2203122109 ./dev-db/pglogical/pglogical-2.4.1.ebuild
 2301141613 ./dev-db/sqlmap/sqlmap-9999.ebuild
 2303161040 ./dev-db/sqlmap/sqlmap-1.7.2.ebuild
-2303190640 ./dev-db/sqlmap/sqlmap-1.7.3.ebuild
 2304092140 ./dev-db/sqlmap/sqlmap-1.7.4.ebuild
+2304190940 ./dev-db/sqlmap/sqlmap-1.7.3.ebuild
 2212070440 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-3.1.423-r4.ebuild
 2212070440 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-5.0.408-r4.ebuild
 2212070440 ./dev-dotnet/dotnet-sdk-bin/dotnet-sdk-bin-6.0.402-r2.ebuild
@@ -5406,11 +5417,9 @@
 2009162139 ./dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
 2009162139 ./dev-embedded/libdisasm/libdisasm-0.23.ebuild
 2211242140 ./dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
-2301141613 ./dev-embedded/libftdi/libftdi-0.20-r1.ebuild
-2301141613 ./dev-embedded/libftdi/libftdi-1.5-r4.ebuild
-2303312310 ./dev-embedded/libftdi/libftdi-0.20-r2.ebuild
-2303312310 ./dev-embedded/libftdi/libftdi-1.5-r5.ebuild
 2303312310 ./dev-embedded/libftdi/libftdi-9999.ebuild
+2304191340 ./dev-embedded/libftdi/libftdi-0.20-r2.ebuild
+2304191440 ./dev-embedded/libftdi/libftdi-1.5-r5.ebuild
 2210290010 ./dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
 2111241209 ./dev-embedded/lpc21isp/lpc21isp-1.97.ebuild
 2202280139 ./dev-embedded/mcu8051ide/mcu8051ide-1.4.10-r1.ebuild
@@ -6122,8 +6131,7 @@
 2208232140 ./dev-java/commons-io/commons-io-2.11.0-r1.ebuild
 2112171409 ./dev-java/commons-lang/commons-lang-3.12.0.ebuild
 2203081640 ./dev-java/commons-lang/commons-lang-2.6-r2.ebuild
-2210142110 ./dev-java/commons-logging/commons-logging-1.2-r6.ebuild
-2303211240 ./dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+2304200810 ./dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
 2208232140 ./dev-java/commons-math/commons-math-3.6.1-r2.ebuild
 2212081940 ./dev-java/commons-net/commons-net-3.9.0.ebuild
 2107020939 ./dev-java/commons-validator/commons-validator-1.7.ebuild
@@ -6264,10 +6272,8 @@
 2204222140 ./dev-java/lucene/lucene-2.4.1-r3.ebuild
 2212101910 ./dev-java/lzma/lzma-22.01.ebuild
 2208051040 ./dev-java/lzmajio/lzmajio-0.95-r3.ebuild
-2301311710 ./dev-java/maven-bin/maven-bin-3.8.7.ebuild
-2303101210 ./dev-java/maven-bin/maven-bin-3.9.0.ebuild
-2303191040 ./dev-java/maven-bin/maven-bin-3.8.8.ebuild
 2304181010 ./dev-java/maven-bin/maven-bin-3.9.1.ebuild
+2304191440 ./dev-java/maven-bin/maven-bin-3.8.8.ebuild
 2204010840 ./dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
 2208051040 ./dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
 2208192010 ./dev-java/metainf-services/metainf-services-1.9.ebuild
@@ -6321,7 +6327,7 @@
 2212022040 ./dev-java/slf4j-nop/slf4j-nop-2.0.3.ebuild
 2212022040 ./dev-java/slf4j-simple/slf4j-simple-2.0.3.ebuild
 2210122240 ./dev-java/snakeyaml/snakeyaml-1.33.ebuild
-2303201040 ./dev-java/snakeyaml/snakeyaml-2.0.ebuild
+2304191240 ./dev-java/snakeyaml/snakeyaml-2.0.ebuild
 2209162140 ./dev-java/snappy/snappy-1.1.7.8-r1.ebuild
 2207102240 ./dev-java/sparsebitset/sparsebitset-1.2.ebuild
 2111240109 ./dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
@@ -6410,11 +6416,11 @@
 2304041140 ./dev-java/jakarta-mail-api/jakarta-mail-api-2.1.1.ebuild
 2208232140 ./dev-java/fastinfoset/fastinfoset-2.1.0-r1.ebuild
 2208121340 ./dev-java/istack-commons-runtime/istack-commons-runtime-4.1.1-r1.ebuild
-2303210940 ./dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
+2304201610 ./dev-java/istack-commons-runtime/istack-commons-runtime-3.0.12.ebuild
 2208232140 ./dev-java/jaxb-runtime/jaxb-runtime-4.0.0-r1.ebuild
-2303312040 ./dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
+2304201610 ./dev-java/jaxb-runtime/jaxb-runtime-2.3.8.ebuild
 2208232140 ./dev-java/jaxb-stax-ex/jaxb-stax-ex-2.1.0-r1.ebuild
-2303210940 ./dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
+2304201610 ./dev-java/jaxb-stax-ex/jaxb-stax-ex-1.8.3.ebuild
 2208121510 ./dev-java/saslprep/saslprep-1.1-r1.ebuild
 2209171610 ./dev-java/scram/scram-2.1.ebuild
 2207281040 ./dev-java/stringprep/stringprep-1.1.ebuild
@@ -6475,7 +6481,7 @@
 2303101140 ./dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
 2304160910 ./dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
 2304160910 ./dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
-2303312040 ./dev-java/txw2/txw2-2.3.8-r1.ebuild
+2304201610 ./dev-java/txw2/txw2-2.3.8-r1.ebuild
 2303260840 ./dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
 2304011940 ./dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
 2304011940 ./dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
@@ -6548,6 +6554,7 @@
 2212190410 ./dev-lang/jimtcl/jimtcl-0.81.ebuild
 2301141613 ./dev-lang/jsonnet/jsonnet-0.19.0-r1.ebuild
 2302210940 ./dev-lang/jsonnet/jsonnet-0.19.1.ebuild
+2304190340 ./dev-lang/jsonnet/jsonnet-0.20.0.ebuild
 2208231340 ./dev-lang/julia-bin/julia-bin-1.7.3.ebuild
 2208231340 ./dev-lang/julia-bin/julia-bin-9999.ebuild
 2212130940 ./dev-lang/julia-bin/julia-bin-1.6.7.ebuild
@@ -6700,6 +6707,7 @@
 2303260210 ./dev-lang/vala/vala-0.56.5.ebuild
 2304012210 ./dev-lang/vala/vala-0.56.4.ebuild
 2304042210 ./dev-lang/vala/vala-0.56.6.ebuild
+2304181910 ./dev-lang/vala/vala-0.56.7.ebuild
 2303172140 ./dev-lang/whitespace/whitespace-0.4.ebuild
 2105081809 ./dev-lang/xsb/xsb-3.8.0.ebuild
 2209220740 ./dev-lang/xsb/xsb-4.0.0.ebuild
@@ -6816,7 +6824,7 @@
 2211052310 ./dev-libs/concurrencykit/concurrencykit-0.7.1-r1.ebuild
 2212041910 ./dev-libs/confuse/confuse-3.3.ebuild
 2302262310 ./dev-libs/confuse/confuse-3.3-r1.ebuild
-2303140240 ./dev-libs/confuse/confuse-3.3-r2.ebuild
+2304190840 ./dev-libs/confuse/confuse-3.3-r2.ebuild
 2209041540 ./dev-libs/console_bridge/console_bridge-1.0.2.ebuild
 2209041540 ./dev-libs/console_bridge/console_bridge-9999.ebuild
 2111272010 ./dev-libs/cppcodec/cppcodec-0.2.ebuild
@@ -6942,9 +6950,9 @@
 2208280840 ./dev-libs/iniparser/iniparser-4.1.ebuild
 2209091110 ./dev-libs/iniparser/iniparser-3.1-r3.ebuild
 2008201709 ./dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
-2304032240 ./dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild
-2304092240 ./dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.11.ebuild
 2304102210 ./dev-libs/intel-compute-runtime/intel-compute-runtime-23.09.25812.14.ebuild
+2304190010 ./dev-libs/intel-compute-runtime/intel-compute-runtime-23.05.25593.18.ebuild
+2304190010 ./dev-libs/intel-compute-runtime/intel-compute-runtime-23.13.26032.8.ebuild
 2205041140 ./dev-libs/isl/isl-0.24-r2.ebuild
 2304071910 ./dev-libs/isl/isl-0.26.ebuild
 2208280940 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -7006,8 +7014,8 @@
 2301141613 ./dev-libs/libcdada/libcdada-0.3.4-r2.ebuild
 2301141613 ./dev-libs/libcdada/libcdada-0.3.5.ebuild
 2301141613 ./dev-libs/libcdada/libcdada-0.4.0.ebuild
-2108240209 ./dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
-2212071710 ./dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+2304201410 ./dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+2304201410 ./dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
 2301141613 ./dev-libs/libcec/libcec-6.0.2.ebuild
 2201040239 ./dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
 2201040239 ./dev-libs/libcgroup/libcgroup-2.0.ebuild
@@ -7018,8 +7026,9 @@
 2301302340 ./dev-libs/libclc/libclc-17.0.0.9999.ebuild
 2303251440 ./dev-libs/libclc/libclc-17.0.0_pre20230325.ebuild
 2304052140 ./dev-libs/libclc/libclc-16.0.1.ebuild
-2304050940 ./dev-libs/libclc/libclc-16.0.2.9999.ebuild
 2304142240 ./dev-libs/libclc/libclc-17.0.0_pre20230414.ebuild
+2304192310 ./dev-libs/libclc/libclc-16.0.2.ebuild
+2304191910 ./dev-libs/libclc/libclc-16.0.3.9999.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2211131510 ./dev-libs/libconfig/libconfig-1.7.3.ebuild
 2205171110 ./dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
@@ -7031,6 +7040,7 @@
 2303090440 ./dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
 2304032340 ./dev-libs/libdispatch/libdispatch-5.7.1.ebuild
 2304032340 ./dev-libs/libdispatch/libdispatch-5.7.3.ebuild
+2304190040 ./dev-libs/libdispatch/libdispatch-5.8.ebuild
 2112260340 ./dev-libs/libdivecomputer/libdivecomputer-0.6.0-r1.ebuild
 2112260340 ./dev-libs/libdivecomputer/libdivecomputer-9999.ebuild
 2209190940 ./dev-libs/libdivsufsort/libdivsufsort-2.0.1-r2.ebuild
@@ -7246,9 +7256,7 @@
 1911300139 ./dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
 2211160910 ./dev-libs/libtommath/libtommath-1.2.0-r2.ebuild
 2211080810 ./dev-libs/libtompoly/libtompoly-0.04-r2.ebuild
-2205201240 ./dev-libs/libtpms/libtpms-0.9.4.ebuild
 2303171740 ./dev-libs/libtpms/libtpms-0.9.6.ebuild
-2303302040 ./dev-libs/libtpms/libtpms-0.9.5.ebuild
 2011142339 ./dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
 2202192010 ./dev-libs/libtsm/libtsm-4.0.2.ebuild
 2011142339 ./dev-libs/libtubo/libtubo-5.0.15.ebuild
@@ -7378,16 +7386,10 @@
 2212230640 ./dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
 2302131010 ./dev-libs/openssl-compat/openssl-compat-1.1.1t.ebuild
 2210081940 ./dev-libs/openssl/openssl-1.0.2u-r1.ebuild
-2303112109 ./dev-libs/openssl/openssl-3.0.8-r1.ebuild
-2303140010 ./dev-libs/openssl/openssl-1.1.1s.ebuild
-2303150640 ./dev-libs/openssl/openssl-3.1.0.ebuild
-2303230210 ./dev-libs/openssl/openssl-3.0.8-r2.ebuild
-2303230210 ./dev-libs/openssl/openssl-3.1.0-r1.ebuild
 2304130710 ./dev-libs/openssl/openssl-1.1.1t-r1.ebuild
-2304130710 ./dev-libs/openssl/openssl-1.1.1t-r2.ebuild
-2304130710 ./dev-libs/openssl/openssl-1.1.1t-r3.ebuild
-2304130710 ./dev-libs/openssl/openssl-3.0.8-r3.ebuild
-2304130710 ./dev-libs/openssl/openssl-3.1.0-r2.ebuild
+2304191440 ./dev-libs/openssl/openssl-1.1.1t-r3.ebuild
+2304202010 ./dev-libs/openssl/openssl-3.0.8-r4.ebuild
+2304202010 ./dev-libs/openssl/openssl-3.1.0-r3.ebuild
 2207100940 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
 2208121540 ./dev-libs/pakchois/pakchois-0.4-r2.ebuild
 2301250310 ./dev-libs/papi/papi-6.0.0.1-r1.ebuild
@@ -7466,7 +7468,7 @@
 2302221940 ./dev-libs/roct-thunk-interface/roct-thunk-interface-5.4.3.ebuild
 1911180139 ./dev-libs/rremove/rremove-1.0.5.ebuild
 2105011039 ./dev-libs/s2n/s2n-1.0.0.ebuild
-2206231440 ./dev-libs/sdformat/sdformat-9.8.0.ebuild
+2304181640 ./dev-libs/sdformat/sdformat-9.10.0.ebuild
 2303030940 ./dev-libs/serd/serd-0.30.16.ebuild
 2202111809 ./dev-libs/serdisplib/serdisplib-2.02-r2.ebuild
 2203200410 ./dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -7545,6 +7547,7 @@
 2303260210 ./dev-libs/vala-common/vala-common-0.56.5.ebuild
 2304012210 ./dev-libs/vala-common/vala-common-0.56.4.ebuild
 2304042210 ./dev-libs/vala-common/vala-common-0.56.6.ebuild
+2304181910 ./dev-libs/vala-common/vala-common-0.56.7.ebuild
 2212212240 ./dev-libs/vc/vc-1.4.3.ebuild
 2301141613 ./dev-libs/voikko-fi/voikko-fi-2.5-r1.ebuild
 2301141613 ./dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
@@ -7560,16 +7563,17 @@
 2301202040 ./dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
 2301141613 ./dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
 2301292040 ./dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
-2304021310 ./dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
+2304201610 ./dev-libs/xapian-bindings/xapian-bindings-1.4.22.ebuild
 2211151010 ./dev-libs/xapian/xapian-1.4.19.ebuild
 2301292040 ./dev-libs/xapian/xapian-1.4.21.ebuild
 2303302140 ./dev-libs/xapian/xapian-1.4.21-r1.ebuild
-2304021310 ./dev-libs/xapian/xapian-1.4.22.ebuild
+2304201610 ./dev-libs/xapian/xapian-1.4.22.ebuild
 2210010240 ./dev-libs/xbyak/xbyak-5.73.ebuild
 2204261810 ./dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
 2304020610 ./dev-libs/xerces-c/xerces-c-3.2.4.ebuild
 2304020610 ./dev-libs/xerces-c/xerces-c-9999.ebuild
 2211182140 ./dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild
+2304190940 ./dev-libs/xmlrpc-c/xmlrpc-c-1.54.06.ebuild
 2212182310 ./dev-libs/xmlsec/xmlsec-1.2.36.ebuild
 2302080640 ./dev-libs/xmlsec/xmlsec-1.2.37.ebuild
 2304170410 ./dev-libs/xmlsec/xmlsec-1.3.0-r1.ebuild
@@ -7611,11 +7615,13 @@
 2212031510 ./dev-libs/tree-sitter-tsq/tree-sitter-tsq-0.19.0.ebuild
 2302171310 ./dev-libs/libgrapheme/libgrapheme-2.0.2.ebuild
 2212020640 ./dev-libs/libchdr/libchdr-0_p20221129.ebuild
+2304191040 ./dev-libs/libchdr/libchdr-0_p20230230.ebuild
 2202181739 ./dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild
 2208080940 ./dev-libs/tllist/tllist-1.0.5-r1.ebuild
 2208131140 ./dev-libs/tllist/tllist-1.1.0.ebuild
 2303041940 ./dev-libs/teakra/teakra-20220224.ebuild
 2304092240 ./dev-libs/intel-metrics-library/intel-metrics-library-0_pre20221216.ebuild
+2304190010 ./dev-libs/intel-metrics-library/intel-metrics-library-0_pre20230417.ebuild
 2304092240 ./dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.12.1.ebuild
 2304161910 ./dev-libs/nwjs/nwjs-0.75.0.ebuild
 2301070310 ./dev-libs/redis-ipc/redis-ipc-0.1.0.ebuild
@@ -7676,14 +7682,14 @@
 2304012210 ./dev-libs/libayatana-appindicator/libayatana-appindicator-0.5.92.ebuild
 2304012210 ./dev-libs/libayatana-indicator/libayatana-indicator-0.9.3.ebuild
 2212292040 ./dev-libs/c-blosc2/c-blosc2-2.6.1.ebuild
-2302080240 ./dev-libs/mdns/mdns-1.4.2.ebuild
+2304201410 ./dev-libs/mdns/mdns-1.4.2.ebuild
 2301080810 ./dev-libs/miniaudio/miniaudio-0.11.11.ebuild
 2302250140 ./dev-libs/cglm/cglm-0.8.9.ebuild
 2303040210 ./dev-libs/cglm/cglm-0.8.9-r1.ebuild
 2304152110 ./dev-libs/cutlass/cutlass-2.10.0-r1.ebuild
 2303210140 ./dev-libs/libdex/libdex-0.2.0.ebuild
-2304102210 ./dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
-2304172110 ./dev-libs/ktextaddons/ktextaddons-1.1.1-r1.ebuild
+2304190010 ./dev-libs/intel-metrics-discovery/intel-metrics-discovery-1.12.164.ebuild
+2304182040 ./dev-libs/ktextaddons/ktextaddons-1.2.0.ebuild
 2304180910 ./dev-libs/qhotkey/qhotkey-1.5.0.ebuild
 2303250511 ./dev-lisp/abcl/abcl-1.9.1.ebuild
 2205132310 ./dev-lisp/alexandria/alexandria-1.4.ebuild
@@ -7739,13 +7745,12 @@
 2211041140 ./dev-lua/luaexpat/luaexpat-1.5.1.ebuild
 2202100410 ./dev-lua/luafilesystem/luafilesystem-1.8.0-r101.ebuild
 2210232340 ./dev-lua/luajson/luajson-1.3.4.ebuild
-2204171840 ./dev-lua/lualdap/lualdap-1.3.0-r2.ebuild
-2303151510 ./dev-lua/lualdap/lualdap-1.3.1.ebuild
+2304190440 ./dev-lua/lualdap/lualdap-1.3.1.ebuild
 2207120240 ./dev-lua/luaossl/luaossl-20220711.ebuild
 2303040310 ./dev-lua/luaposix/luaposix-36.1.ebuild
 2302211010 ./dev-lua/luarocks/luarocks-3.9.2.ebuild
 2208312140 ./dev-lua/luasec/luasec-1.2.0.ebuild
-2303200140 ./dev-lua/luasec/luasec-1.3.1.ebuild
+2304200810 ./dev-lua/luasec/luasec-1.3.1.ebuild
 2208300910 ./dev-lua/luasocket/luasocket-3.1.0.ebuild
 2209260240 ./dev-lua/luassert/luassert-1.9.0.ebuild
 2202100210 ./dev-lua/luasystem/luasystem-0.2.1_p0-r1.ebuild
@@ -7757,7 +7762,7 @@
 2202100210 ./dev-lua/mediator_lua/mediator_lua-1.1.2_p0-r1.ebuild
 2107091339 ./dev-lua/messagepack/messagepack-0.5.2_p20201025-r100.ebuild
 2207151110 ./dev-lua/mpack/mpack-1.0.9-r1.ebuild
-2303200140 ./dev-lua/mpack/mpack-1.0.10.ebuild
+2304200810 ./dev-lua/mpack/mpack-1.0.10.ebuild
 2208220310 ./dev-lua/penlight/penlight-1.13.1.ebuild
 2211240310 ./dev-lua/say/say-1.4.1.ebuild
 2109281609 ./dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
@@ -7775,7 +7780,7 @@
 2101271239 ./dev-ml/async_extra/async_extra-0.14.0.ebuild
 2204272310 ./dev-ml/async_extra/async_extra-0.15.0.ebuild
 2204190039 ./dev-ml/async_kernel/async_kernel-0.14.0.ebuild
-2302250140 ./dev-ml/async_kernel/async_kernel-0.15.0.ebuild
+2304200010 ./dev-ml/async_kernel/async_kernel-0.15.0.ebuild
 2101271809 ./dev-ml/async_rpc_kernel/async_rpc_kernel-0.14.0-r1.ebuild
 2302250140 ./dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
 2210141610 ./dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -7786,7 +7791,7 @@
 2302012240 ./dev-ml/base/base-0.15.0-r3.ebuild
 2303242310 ./dev-ml/base/base-0.15.1-r1.ebuild
 2210200010 ./dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
-2302250140 ./dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
+2304200010 ./dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
 2210200010 ./dev-ml/base_quickcheck/base_quickcheck-0.14.0-r1.ebuild
 2210200010 ./dev-ml/base_quickcheck/base_quickcheck-0.14.1-r2.ebuild
 2304012310 ./dev-ml/base_quickcheck/base_quickcheck-0.15.0-r2.ebuild
@@ -7839,12 +7844,12 @@
 2204221309 ./dev-ml/core/core-0.14.0-r4.ebuild
 2210152010 ./dev-ml/core/core-0.14.1-r1.ebuild
 2301270340 ./dev-ml/core/core-0.15.0.ebuild
-2302250140 ./dev-ml/core/core-0.15.1-r1.ebuild
+2304200010 ./dev-ml/core/core-0.15.1-r1.ebuild
 2204190039 ./dev-ml/core_bench/core_bench-0.14.0.ebuild
 2302250140 ./dev-ml/core_bench/core_bench-0.15.0.ebuild
 2210150040 ./dev-ml/core_kernel/core_kernel-0.14.2-r1.ebuild
 2210151940 ./dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
-2302250140 ./dev-ml/core_kernel/core_kernel-0.15.0.ebuild
+2304200010 ./dev-ml/core_kernel/core_kernel-0.15.0.ebuild
 2302260240 ./dev-ml/cppo/cppo-1.6.7-r1.ebuild
 2302260240 ./dev-ml/cppo/cppo-1.6.8-r1.ebuild
 2302260240 ./dev-ml/cppo/cppo-1.6.9-r1.ebuild
@@ -7934,8 +7939,9 @@
 2301251140 ./dev-ml/llvm-ocaml/llvm-ocaml-17.0.0.9999.ebuild
 2303251440 ./dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230325.ebuild
 2304052140 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.1.ebuild
-2304050940 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.9999.ebuild
 2304142240 ./dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230414.ebuild
+2304192310 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.2.ebuild
+2304191910 ./dev-ml/llvm-ocaml/llvm-ocaml-16.0.3.9999.ebuild
 2204190039 ./dev-ml/logs/logs-0.7.0-r1.ebuild
 2201100109 ./dev-ml/luv/luv-0.5.10-r3.ebuild
 2210192110 ./dev-ml/luv/luv-0.5.11-r2.ebuild
@@ -7980,10 +7986,10 @@
 2304092210 ./dev-ml/ocaml-expat/ocaml-expat-1.3.0.ebuild
 2302240310 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3-r1.ebuild
 2302240310 ./dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.4-r1.ebuild
-2302240310 ./dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
-2302240310 ./dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r1.ebuild
+2304190110 ./dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
+2304191910 ./dev-ml/ocaml-gettext-stub/ocaml-gettext-stub-0.4.2-r2.ebuild
 2302240310 ./dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r3.ebuild
-2302240310 ./dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+2304190110 ./dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
 2104210539 ./dev-ml/ocaml-hashcons/ocaml-hashcons-1.3.ebuild
 2203040040 ./dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.1.0.ebuild
 2203040040 ./dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.2.0.ebuild
@@ -8231,7 +8237,7 @@
 2301281640 ./dev-ml/sedlex/sedlex-3.0.ebuild
 2212052110 ./dev-ml/fix/fix-20211125.ebuild
 2212052110 ./dev-ml/fix/fix-20220121.ebuild
-2112080239 ./dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
+2304190110 ./dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
 2209091610 ./dev-ml/lambda-term/lambda-term-3.1.0.ebuild
 2301131540 ./dev-ml/lambda-term/lambda-term-3.3.1-r1.ebuild
 2112082209 ./dev-ml/lwt_log/lwt_log-1.1.1-r1.ebuild
@@ -8274,7 +8280,7 @@
 2204271010 ./dev-ml/core_unix/core_unix-0.15.0.ebuild
 2302250140 ./dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
 2302250140 ./dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
-2302250140 ./dev-ml/int_repr/int_repr-0.15.0.ebuild
+2304191010 ./dev-ml/int_repr/int_repr-0.15.0.ebuild
 2204271140 ./dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.1.ebuild
 2302250140 ./dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
 2303251810 ./dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
@@ -8903,7 +8909,7 @@
 2205141010 ./dev-perl/ExtUtils-Config/ExtUtils-Config-0.8.0-r1.ebuild
 2105291209 ./dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.210.0.ebuild
 2112050639 ./dev-perl/ExtUtils-CppGuess/ExtUtils-CppGuess-0.230.0.ebuild
-2108060339 ./dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
+2304201410 ./dev-perl/ExtUtils-Depends/ExtUtils-Depends-0.800.100.ebuild
 2108031509 ./dev-perl/ExtUtils-F77/ExtUtils-F77-1.260.0.ebuild
 2205141340 ./dev-perl/ExtUtils-HasCompiler/ExtUtils-HasCompiler-0.23.0.ebuild
 2205141010 ./dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.26.0-r1.ebuild
@@ -9229,7 +9235,7 @@
 2106260109 ./dev-perl/Locale-PO/Locale-PO-0.270.0-r1.ebuild
 2204291110 ./dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild
 2111100009 ./dev-perl/LockFile-Simple/LockFile-Simple-0.208.0-r3.ebuild
-2112210709 ./dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
+2304201410 ./dev-perl/Log-Agent/Log-Agent-1.5.0.ebuild
 2109171109 ./dev-perl/Log-Any/Log-Any-1.709.0.ebuild
 2112132209 ./dev-perl/Log-Any/Log-Any-1.710.0.ebuild
 2212102140 ./dev-perl/Log-Dispatch-Array/Log-Dispatch-Array-1.3.0-r1.ebuild
@@ -10147,7 +10153,7 @@
 2107102309 ./dev-perl/constant-defer/constant-defer-6.0.0-r1.ebuild
 2110280109 ./dev-perl/enum/enum-1.120.0.ebuild
 2102100039 ./dev-perl/forks/forks-0.360.0-r2.ebuild
-2112210709 ./dev-perl/glib-perl/glib-perl-1.329.300.ebuild
+2304201410 ./dev-perl/glib-perl/glib-perl-1.329.300.ebuild
 2108250839 ./dev-perl/gnome2-wnck/gnome2-wnck-0.180.0.ebuild
 1910201509 ./dev-perl/go-perl/go-perl-0.150.0.ebuild
 2107112339 ./dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r2.ebuild
@@ -10568,6 +10574,7 @@
 2101072239 ./dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
 2108271639 ./dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild
 2203252009 ./dev-php/twig/twig-1.44.6.ebuild
+2304190740 ./dev-php/twig/twig-1.44.7.ebuild
 2106132139 ./dev-php/webmozart-assert/webmozart-assert-1.10.0.ebuild
 2012150539 ./dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
 2003261841 ./dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
@@ -10689,9 +10696,11 @@
 2303281810 ./dev-python/aws-sam-translator/aws-sam-translator-1.62.0.ebuild
 2303280840 ./dev-python/aws-sam-translator/aws-sam-translator-1.63.0.ebuild
 2304070740 ./dev-python/aws-sam-translator/aws-sam-translator-1.64.0.ebuild
+2304200640 ./dev-python/aws-sam-translator/aws-sam-translator-1.65.0.ebuild
 2301101810 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.11.0-r1.ebuild
 2304032210 ./dev-python/aws-xray-sdk-python/aws-xray-sdk-python-2.12.0.ebuild
 2304040810 ./dev-python/awxkit/awxkit-22.0.0.ebuild
+2304190910 ./dev-python/awxkit/awxkit-22.1.0.ebuild
 2301141613 ./dev-python/babelfish/babelfish-0.6.0-r2.ebuild
 2301141613 ./dev-python/babelfish/babelfish-9999.ebuild
 2303160710 ./dev-python/backcall/backcall-0.2.0-r1.ebuild
@@ -10735,6 +10744,7 @@
 2304140640 ./dev-python/boto3/boto3-1.26.113.ebuild
 2304150840 ./dev-python/boto3/boto3-1.26.114.ebuild
 2304180610 ./dev-python/boto3/boto3-1.26.115.ebuild
+2304200540 ./dev-python/boto3/boto3-1.26.116.ebuild
 2303281710 ./dev-python/botocore/botocore-9999.ebuild
 2304080840 ./dev-python/botocore/botocore-1.29.109.ebuild
 2304130910 ./dev-python/botocore/botocore-1.29.104.ebuild
@@ -10742,6 +10752,7 @@
 2304140640 ./dev-python/botocore/botocore-1.29.113.ebuild
 2304150840 ./dev-python/botocore/botocore-1.29.114.ebuild
 2304180610 ./dev-python/botocore/botocore-1.29.115.ebuild
+2304200540 ./dev-python/botocore/botocore-1.29.116.ebuild
 2303242310 ./dev-python/bottle/bottle-0.12.25.ebuild
 2304081410 ./dev-python/bottleneck/bottleneck-1.3.7.ebuild
 2302211110 ./dev-python/bpython/bpython-0.24.ebuild
@@ -10779,6 +10790,7 @@
 2304040810 ./dev-python/cfn-lint/cfn-lint-0.76.2.ebuild
 2304110640 ./dev-python/cfn-lint/cfn-lint-0.77.0.ebuild
 2304180610 ./dev-python/cfn-lint/cfn-lint-0.77.1.ebuild
+2304200640 ./dev-python/cfn-lint/cfn-lint-0.77.2.ebuild
 2303160710 ./dev-python/cftime/cftime-1.6.2.ebuild
 2301141613 ./dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
 2304081410 ./dev-python/chameleon/chameleon-4.0.0.ebuild
@@ -10797,8 +10809,9 @@
 2301251140 ./dev-python/clang-python/clang-python-17.0.0.9999.ebuild
 2303251440 ./dev-python/clang-python/clang-python-17.0.0_pre20230325.ebuild
 2304052140 ./dev-python/clang-python/clang-python-16.0.1.ebuild
-2304050940 ./dev-python/clang-python/clang-python-16.0.2.9999.ebuild
 2304142240 ./dev-python/clang-python/clang-python-17.0.0_pre20230414.ebuild
+2304192310 ./dev-python/clang-python/clang-python-16.0.2.ebuild
+2304191910 ./dev-python/clang-python/clang-python-16.0.3.9999.ebuild
 2301141613 ./dev-python/cleo/cleo-2.0.1.ebuild
 2301141613 ./dev-python/cli_helpers/cli_helpers-2.3.0.ebuild
 2301141613 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -10808,7 +10821,7 @@
 2303042040 ./dev-python/click-plugins/click-plugins-1.1.1-r1.ebuild
 2301141613 ./dev-python/click-threading/click-threading-0.5.0-r1.ebuild
 2301141613 ./dev-python/click/click-8.1.3.ebuild
-2303171910 ./dev-python/cliff/cliff-4.2.0.ebuild
+2304191840 ./dev-python/cliff/cliff-4.2.0.ebuild
 2301141613 ./dev-python/clikit/clikit-0.6.2-r1.ebuild
 2302230210 ./dev-python/clint/clint-0.5.1-r4.ebuild
 2302211110 ./dev-python/cloudpickle/cloudpickle-2.2.1.ebuild
@@ -10849,14 +10862,14 @@
 2303171840 ./dev-python/css-parser/css-parser-1.0.8.ebuild
 2301141613 ./dev-python/cssselect/cssselect-1.2.0.ebuild
 2303160710 ./dev-python/cssselect2/cssselect2-0.7.0.ebuild
-2303030911 ./dev-python/cssutils/cssutils-2.6.0.ebuild
+2304191840 ./dev-python/cssutils/cssutils-2.6.0.ebuild
 2302230940 ./dev-python/csvkit/csvkit-1.1.1.ebuild
 2303160710 ./dev-python/curtsies/curtsies-0.4.1-r1.ebuild
 2304071710 ./dev-python/cvxopt/cvxopt-1.3.0.ebuild
 2301141613 ./dev-python/cwcwidth/cwcwidth-0.1.8.ebuild
-2301141613 ./dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
-2304032240 ./dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
-2304090940 ./dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
+2304191840 ./dev-python/cx_Freeze/cx_Freeze-6.13.1.ebuild
+2304191840 ./dev-python/cx_Freeze/cx_Freeze-6.14.5.ebuild
+2304191840 ./dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
 2302192310 ./dev-python/cycler/cycler-0.11.0-r1.ebuild
 2301141613 ./dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
 2303240840 ./dev-python/cython/cython-0.29.33-r1.ebuild
@@ -10864,8 +10877,8 @@
 2303311510 ./dev-python/cython/cython-0.29.33.ebuild
 2304022310 ./dev-python/cython/cython-0.29.34.ebuild
 2301211240 ./dev-python/daemonize/daemonize-2.5.0-r1.ebuild
-2304051210 ./dev-python/dask/dask-2023.3.2.ebuild
-2304151140 ./dev-python/dask/dask-2023.4.0.ebuild
+2304191840 ./dev-python/dask/dask-2023.3.2.ebuild
+2304191840 ./dev-python/dask/dask-2023.4.0.ebuild
 2303170840 ./dev-python/dbfread/dbfread-2.0.7-r1.ebuild
 2302140840 ./dev-python/dbus-python/dbus-python-1.3.2.ebuild
 2301141613 ./dev-python/ddt/ddt-1.6.0.ebuild
@@ -10885,6 +10898,7 @@
 2303252040 ./dev-python/discogs-client/discogs-client-9999.ebuild
 2301141613 ./dev-python/diskcache/diskcache-5.4.0-r1.ebuild
 2304112040 ./dev-python/diskcache/diskcache-5.5.1.ebuild
+2304190940 ./dev-python/diskcache/diskcache-5.6.1.ebuild
 2301141613 ./dev-python/dissononce/dissononce-0.34.3-r3.ebuild
 2301141613 ./dev-python/distlib/distlib-0.3.6.ebuild
 2303160710 ./dev-python/distro/distro-1.8.0.ebuild
@@ -10919,7 +10933,7 @@
 2301271640 ./dev-python/djangorestframework/djangorestframework-3.14.0.ebuild
 2303301940 ./dev-python/dkimpy/dkimpy-1.1.1.ebuild
 2304100940 ./dev-python/dkimpy/dkimpy-1.1.2.ebuild
-2302171410 ./dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
+2304191840 ./dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
 2302162040 ./dev-python/dnspython/dnspython-2.3.0.ebuild
 2303160710 ./dev-python/doc8/doc8-1.1.1.ebuild
 2301141613 ./dev-python/docker-py/docker-py-5.0.3.ebuild
@@ -10981,6 +10995,7 @@
 2303262110 ./dev-python/filelock/filelock-3.10.6.ebuild
 2303272010 ./dev-python/filelock/filelock-3.10.7.ebuild
 2304070740 ./dev-python/filelock/filelock-3.11.0.ebuild
+2304190940 ./dev-python/filelock/filelock-3.12.0.ebuild
 2303160710 ./dev-python/filetype/filetype-1.2.0.ebuild
 2301141613 ./dev-python/findimports/findimports-2.3.0.ebuild
 2301141613 ./dev-python/fitsio/fitsio-1.1.8.ebuild
@@ -11004,7 +11019,7 @@
 2303252040 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
 2301141613 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
 2303032240 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.3.ebuild
-2303252040 ./dev-python/flask/flask-2.2.3.ebuild
+2304191840 ./dev-python/flask/flask-2.2.3.ebuild
 2304051040 ./dev-python/flatbuffers/flatbuffers-23.3.3.ebuild
 2301141613 ./dev-python/fleep/fleep-1.0.1-r1.ebuild
 2301141613 ./dev-python/fleep/fleep-9999.ebuild
@@ -11044,6 +11059,7 @@
 2303290910 ./dev-python/google-api-python-client/google-api-python-client-2.83.0.ebuild
 2304060640 ./dev-python/google-api-python-client/google-api-python-client-2.84.0.ebuild
 2304112040 ./dev-python/google-api-python-client/google-api-python-client-2.85.0.ebuild
+2304190940 ./dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
 2303032310 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r3.ebuild
 2302080940 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-1.0.0.ebuild
 2304130910 ./dev-python/google-auth/google-auth-2.17.1.ebuild
@@ -11073,7 +11089,7 @@
 2301141613 ./dev-python/happybase/happybase-1.2.0.ebuild
 2302140840 ./dev-python/hcloud-python/hcloud-python-1.18.2.ebuild
 2304130910 ./dev-python/hcloud-python/hcloud-python-1.19.0.ebuild
-2303160710 ./dev-python/helpdev/helpdev-0.7.1-r1.ebuild
+2304191840 ./dev-python/helpdev/helpdev-0.7.1-r1.ebuild
 2304051141 ./dev-python/hiredis/hiredis-2.2.2-r1.ebuild
 2301141613 ./dev-python/hpack/hpack-4.0.0-r1.ebuild
 2303160710 ./dev-python/html2text/html2text-2020.1.16-r2.ebuild
@@ -11097,13 +11113,8 @@
 2303071040 ./dev-python/hvac/hvac-1.1.0.ebuild
 2303160710 ./dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild
 2303160710 ./dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
-2303171910 ./dev-python/hypothesis/hypothesis-6.68.2.ebuild
-2303160640 ./dev-python/hypothesis/hypothesis-6.69.0.ebuild
-2303170840 ./dev-python/hypothesis/hypothesis-6.70.0.ebuild
-2303280840 ./dev-python/hypothesis/hypothesis-6.70.1.ebuild
-2304032210 ./dev-python/hypothesis/hypothesis-6.70.2.ebuild
-2304080840 ./dev-python/hypothesis/hypothesis-6.71.0.ebuild
-2304170940 ./dev-python/hypothesis/hypothesis-6.72.0.ebuild
+2304200740 ./dev-python/hypothesis/hypothesis-6.71.0.ebuild
+2304200640 ./dev-python/hypothesis/hypothesis-6.72.1.ebuild
 2303160710 ./dev-python/icalendar/icalendar-5.0.4.ebuild
 2304140710 ./dev-python/icalendar/icalendar-5.0.5.ebuild
 2303251010 ./dev-python/identify/identify-2.5.22.ebuild
@@ -11115,11 +11126,8 @@
 2303160710 ./dev-python/imagesize/imagesize-1.4.1.ebuild
 2301141613 ./dev-python/imapclient/imapclient-2.3.1.ebuild
 2303160710 ./dev-python/iminuit/iminuit-2.19.0.ebuild
+2304190740 ./dev-python/iminuit/iminuit-2.21.3.ebuild
 2301141613 ./dev-python/immutables/immutables-0.19.ebuild
-2304100840 ./dev-python/importlib_metadata/importlib_metadata-6.0.1.ebuild
-2304100840 ./dev-python/importlib_metadata/importlib_metadata-6.3.0.ebuild
-2304152310 ./dev-python/importlib_metadata/importlib_metadata-6.4.1.ebuild
-2303242310 ./dev-python/importlib_resources/importlib_resources-5.12.0.ebuild
 2303160710 ./dev-python/incremental/incremental-22.10.0.ebuild
 2304010940 ./dev-python/indexed_gzip/indexed_gzip-1.7.1.ebuild
 2303030911 ./dev-python/inflect/inflect-6.0.2.ebuild
@@ -11199,10 +11207,10 @@
 2301170840 ./dev-python/jsonref/jsonref-1.1.0.ebuild
 2301141613 ./dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
 2302171210 ./dev-python/jsonrpclib/jsonrpclib-9999.ebuild
-2303160710 ./dev-python/jsonschema/jsonschema-4.17.3.ebuild
+2304191840 ./dev-python/jsonschema/jsonschema-4.17.3.ebuild
 2303160710 ./dev-python/jsonxs/jsonxs-0.6-r1.ebuild
 2301141613 ./dev-python/junit-xml/junit-xml-1.9.ebuild
-2303291640 ./dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
+2304191840 ./dev-python/jupyter-lsp/jupyter-lsp-2.0.1.ebuild
 2304051141 ./dev-python/jupyter/jupyter-1.0.0-r4.ebuild
 2304141640 ./dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
 2303160710 ./dev-python/jupyter_packaging/jupyter_packaging-0.12.3.ebuild
@@ -11218,7 +11226,7 @@
 2303160710 ./dev-python/kaptan/kaptan-0.5.12-r2.ebuild
 2301141613 ./dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
 2304081210 ./dev-python/keep/keep-2.10.1-r2.ebuild
-2303030911 ./dev-python/keyring/keyring-23.13.1-r1.ebuild
+2304191840 ./dev-python/keyring/keyring-23.13.1-r1.ebuild
 2304051910 ./dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
 2303160710 ./dev-python/klein/klein-21.8.0.ebuild
 2304131840 ./dev-python/kombu/kombu-5.3.0_beta3.ebuild
@@ -11245,8 +11253,9 @@
 2303152110 ./dev-python/lit/lit-15.0.7.ebuild
 2303251440 ./dev-python/lit/lit-17.0.0_pre20230325.ebuild
 2304052140 ./dev-python/lit/lit-16.0.1.ebuild
-2304050940 ./dev-python/lit/lit-16.0.2.9999.ebuild
 2304142240 ./dev-python/lit/lit-17.0.0_pre20230414.ebuild
+2304192310 ./dev-python/lit/lit-16.0.2.ebuild
+2304191910 ./dev-python/lit/lit-16.0.3.9999.ebuild
 2301141613 ./dev-python/livereload/livereload-2.6.3.ebuild
 2303160710 ./dev-python/llfuse/llfuse-1.4.2.ebuild
 2303160710 ./dev-python/lmdb/lmdb-1.4.0.ebuild
@@ -11269,9 +11278,9 @@
 2303172010 ./dev-python/mamba/mamba-0.11.2-r1.ebuild
 2301141613 ./dev-python/mando/mando-0.7.1.ebuild
 2303160710 ./dev-python/manuel/manuel-1.12.4.ebuild
-2301141613 ./dev-python/markdown/markdown-3.3.7.ebuild
-2301141613 ./dev-python/markdown/markdown-3.4.1.ebuild
-2303232010 ./dev-python/markdown/markdown-3.4.3.ebuild
+2304191840 ./dev-python/markdown/markdown-3.3.7.ebuild
+2304191840 ./dev-python/markdown/markdown-3.4.1.ebuild
+2304191840 ./dev-python/markdown/markdown-3.4.3.ebuild
 2302222340 ./dev-python/markdown2/markdown2-2.4.8.ebuild
 2303112041 ./dev-python/markups/markups-4.0.0.ebuild
 2301141613 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
@@ -11282,8 +11291,8 @@
 2303030911 ./dev-python/matplotlib/matplotlib-3.6.1.ebuild
 2303030911 ./dev-python/matplotlib/matplotlib-3.6.2.ebuild
 2303030911 ./dev-python/matplotlib/matplotlib-3.6.3.ebuild
-2303030911 ./dev-python/matplotlib/matplotlib-3.7.0.ebuild
-2303042140 ./dev-python/matplotlib/matplotlib-3.7.1.ebuild
+2304191840 ./dev-python/matplotlib/matplotlib-3.7.0.ebuild
+2304191840 ./dev-python/matplotlib/matplotlib-3.7.1.ebuild
 2303160710 ./dev-python/matterhook/matterhook-0.2-r2.ebuild
 2303160710 ./dev-python/mccabe/mccabe-0.7.0.ebuild
 2301141613 ./dev-python/mdx_gh_links/mdx_gh_links-0.3.ebuild
@@ -11309,7 +11318,7 @@
 2304142310 ./dev-python/mkdocs-material/mkdocs-material-9.1.6-r1.ebuild
 2304162040 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.6.4.ebuild
 2304142310 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
-2304142310 ./dev-python/mkdocs/mkdocs-1.4.2.ebuild
+2304191840 ./dev-python/mkdocs/mkdocs-1.4.2.ebuild
 2303171840 ./dev-python/mmtf-python/mmtf-python-1.1.3.ebuild
 2302162040 ./dev-python/mock/mock-5.0.1.ebuild
 2304170910 ./dev-python/mock/mock-5.0.2.ebuild
@@ -11324,6 +11333,7 @@
 2302140840 ./dev-python/mss/mss-7.0.1.ebuild
 2304101940 ./dev-python/mss/mss-8.0.2.ebuild
 2304151140 ./dev-python/mss/mss-8.0.3.ebuild
+2304190910 ./dev-python/mss/mss-9.0.0.ebuild
 2301141613 ./dev-python/multidict/multidict-6.0.4.ebuild
 2303160710 ./dev-python/munch/munch-2.5.0-r2.ebuild
 2301141613 ./dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -11340,10 +11350,10 @@
 2304150140 ./dev-python/nbclassic/nbclassic-0.5.5.ebuild
 2304141640 ./dev-python/nbclient/nbclient-0.7.2.ebuild
 2304141640 ./dev-python/nbclient/nbclient-0.7.3.ebuild
-2304051141 ./dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
-2304051141 ./dev-python/nbconvert/nbconvert-7.2.9.ebuild
-2304060710 ./dev-python/nbconvert/nbconvert-7.3.0.ebuild
-2304142310 ./dev-python/nbconvert/nbconvert-7.3.1.ebuild
+2304191840 ./dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
+2304191840 ./dev-python/nbconvert/nbconvert-7.2.9.ebuild
+2304191840 ./dev-python/nbconvert/nbconvert-7.3.0.ebuild
+2304191840 ./dev-python/nbconvert/nbconvert-7.3.1.ebuild
 2304161540 ./dev-python/nbdime/nbdime-3.1.1-r2.ebuild
 2304051141 ./dev-python/nbformat/nbformat-5.7.3.ebuild
 2304051141 ./dev-python/nbformat/nbformat-5.8.0.ebuild
@@ -11384,14 +11394,14 @@
 2302140840 ./dev-python/olefile/olefile-0.46-r2.ebuild
 2304112140 ./dev-python/openpyxl/openpyxl-3.1.2.ebuild
 2304051040 ./dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
-2303032110 ./dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
+2304191840 ./dev-python/openstacksdk/openstacksdk-1.0.1.ebuild
 2302230940 ./dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild
 2303171840 ./dev-python/ordered-set/ordered-set-4.1.0.ebuild
 2303171840 ./dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
 2303171840 ./dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
 2303172010 ./dev-python/osc-lib/osc-lib-2.7.0.ebuild
 2303242310 ./dev-python/oslo-concurrency/oslo-concurrency-5.1.1.ebuild
-2304051040 ./dev-python/oslo-config/oslo-config-9.1.1.ebuild
+2304191840 ./dev-python/oslo-config/oslo-config-9.1.1.ebuild
 2303132310 ./dev-python/oslo-context/oslo-context-5.1.0.ebuild
 2303212340 ./dev-python/oslo-context/oslo-context-5.1.1.ebuild
 2303212340 ./dev-python/oslo-i18n/oslo-i18n-6.0.0.ebuild
@@ -11444,6 +11454,7 @@
 2303252040 ./dev-python/pebble/pebble-5.0.3.ebuild
 2303160710 ./dev-python/pecan/pecan-1.4.2.ebuild
 2303302010 ./dev-python/peewee/peewee-3.16.0-r1.ebuild
+2304190940 ./dev-python/peewee/peewee-3.16.1.ebuild
 2302282340 ./dev-python/pelican-minify/pelican-minify-0.9-r2.ebuild
 2301141613 ./dev-python/pendulum/pendulum-2.1.2-r2.ebuild
 2301141613 ./dev-python/pep517/pep517-0.13.0.ebuild
@@ -11453,6 +11464,7 @@
 2301170910 ./dev-python/pgzero/pgzero-1.2.1-r2.ebuild
 2304051040 ./dev-python/phonenumbers/phonenumbers-8.13.8.ebuild
 2304112040 ./dev-python/phonenumbers/phonenumbers-8.13.9.ebuild
+2304190910 ./dev-python/phonenumbers/phonenumbers-8.13.10.ebuild
 2302031510 ./dev-python/phply/phply-1.2.6.ebuild
 2301141613 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
 2303160740 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11484,6 +11496,7 @@
 2302211940 ./dev-python/pocketlint/pocketlint-0.24.ebuild
 2302230140 ./dev-python/pockets/pockets-0.9.1-r3.ebuild
 2303160740 ./dev-python/podcastparser/podcastparser-0.6.9.ebuild
+2304190940 ./dev-python/podcastparser/podcastparser-0.6.10.ebuild
 2303272110 ./dev-python/polib/polib-1.2.0.ebuild
 2304150010 ./dev-python/pooch/pooch-1.7.0.ebuild
 2303030911 ./dev-python/portend/portend-3.1.0.ebuild
@@ -11507,6 +11520,7 @@
 2302171110 ./dev-python/prov/prov-2.0.0.ebuild
 2302152040 ./dev-python/pslab-python/pslab-python-2.5.0.ebuild
 2303170840 ./dev-python/psutil/psutil-5.9.4.ebuild
+2304191210 ./dev-python/psutil/psutil-5.9.5.ebuild
 2303252040 ./dev-python/psycopg/psycopg-2.9.4.ebuild
 2304011940 ./dev-python/psycopg/psycopg-3.1.8.ebuild
 2303160740 ./dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
@@ -11523,14 +11537,15 @@
 2303272310 ./dev-python/pyClamd/pyClamd-0.4.0-r4.ebuild
 2302160640 ./dev-python/pyGPG/pyGPG-0.2-r1.ebuild
 2302160640 ./dev-python/pyGPG/pyGPG-9999.ebuild
-2301141613 ./dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
-2303170840 ./dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
+2304191310 ./dev-python/pyacoustid/pyacoustid-1.2.2-r1.ebuild
 2303160740 ./dev-python/pyaes/pyaes-1.6.1-r3.ebuild
 2302171110 ./dev-python/pyalsa/pyalsa-1.2.7.ebuild
 2301141613 ./dev-python/pyamg/pyamg-4.2.3.ebuild
 2304180610 ./dev-python/pyamg/pyamg-5.0.0.ebuild
 2303171840 ./dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
+2304200640 ./dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
 2303160740 ./dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
+2304200640 ./dev-python/pyasn1/pyasn1-0.5.0.ebuild
 2301141613 ./dev-python/pyatspi/pyatspi-2.46.0.ebuild
 2304081440 ./dev-python/pyaudio/pyaudio-0.2.13.ebuild
 2303032110 ./dev-python/pybind11/pybind11-2.10.3.ebuild
@@ -11541,9 +11556,7 @@
 2301141613 ./dev-python/pycares/pycares-4.3.0.ebuild
 2303160740 ./dev-python/pycdio/pycdio-2.1.1-r1.ebuild
 2301141613 ./dev-python/pychm/pychm-0.8.6-r1.ebuild
-2303211010 ./dev-python/pychromecast/pychromecast-13.0.4.ebuild
-2303300540 ./dev-python/pychromecast/pychromecast-13.0.6.ebuild
-2304032210 ./dev-python/pychromecast/pychromecast-13.0.7.ebuild
+2304191310 ./dev-python/pychromecast/pychromecast-13.0.7.ebuild
 2303162210 ./dev-python/pychroot/pychroot-0.10.4.ebuild
 2303162210 ./dev-python/pychroot/pychroot-9999.ebuild
 2303030911 ./dev-python/pyclipper/pyclipper-1.3.0_p4.ebuild
@@ -11594,6 +11607,7 @@
 2301141613 ./dev-python/pygments-github-lexers/pygments-github-lexers-0.0.5.ebuild
 2303252040 ./dev-python/pygments/pygments-2.14.0.ebuild
 2304110640 ./dev-python/pygments/pygments-2.15.0.ebuild
+2304190910 ./dev-python/pygments/pygments-2.15.1.ebuild
 2303250840 ./dev-python/pygobject/pygobject-3.42.2.ebuild
 2303250840 ./dev-python/pygobject/pygobject-3.44.1.ebuild
 2303272240 ./dev-python/pygraphviz/pygraphviz-1.10.ebuild
@@ -11736,6 +11750,7 @@
 2303192110 ./dev-python/pytest-regressions/pytest-regressions-2.4.2.ebuild
 2303242310 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
 2301101740 ./dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc20-r1.ebuild
+2304202040 ./dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
 2301141613 ./dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
 2303171840 ./dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
 2301141613 ./dev-python/pytest-subtesthack/pytest-subtesthack-0.2.0.ebuild
@@ -11783,7 +11798,9 @@
 2302222340 ./dev-python/python-email-validator/python-email-validator-1.3.1.ebuild
 2304160710 ./dev-python/python-email-validator/python-email-validator-2.0.0.ebuild
 2304170910 ./dev-python/python-email-validator/python-email-validator-2.0.0_p1.ebuild
+2304200640 ./dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
 2304091110 ./dev-python/python-engineio/python-engineio-4.4.0.ebuild
+2304200640 ./dev-python/python-engineio/python-engineio-4.4.1.ebuild
 2301141613 ./dev-python/python-evdev/python-evdev-1.6.0.ebuild
 2302272110 ./dev-python/python-gammu/python-gammu-3.2.4-r1.ebuild
 2303171840 ./dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
@@ -11829,6 +11846,7 @@
 2303171910 ./dev-python/python-utils/python-utils-3.5.2.ebuild
 2303030911 ./dev-python/python-varlink/python-varlink-31.0.0.ebuild
 2303171840 ./dev-python/python-vlc/python-vlc-3.0.18121.ebuild
+2304192010 ./dev-python/python-vlc/python-vlc-3.0.18122.ebuild
 2303030911 ./dev-python/python-xlib/python-xlib-0.33.ebuild
 2303091540 ./dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
 2301141613 ./dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
@@ -11973,7 +11991,7 @@
 2301141613 ./dev-python/service_identity/service_identity-21.1.0-r1.ebuild
 2303160740 ./dev-python/setproctitle/setproctitle-1.3.2.ebuild
 2303171840 ./dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
-2304051010 ./dev-python/setuptools/setuptools-67.6.1.ebuild
+2304191840 ./dev-python/setuptools/setuptools-67.6.1.ebuild
 2303030911 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.4.ebuild
 2303040910 ./dev-python/sexpdata/sexpdata-1.0.0.ebuild
 2303170840 ./dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
@@ -12024,20 +12042,19 @@
 2303061640 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.4.0.ebuild
 2302140840 ./dev-python/sphinx-tabs/sphinx-tabs-3.4.1.ebuild
 2302262210 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
-2301141613 ./dev-python/sphinx/sphinx-4.5.0-r1.ebuild
-2301141613 ./dev-python/sphinx/sphinx-5.3.0.ebuild
-2301141613 ./dev-python/sphinx/sphinx-6.1.3.ebuild
+2304191840 ./dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+2304191840 ./dev-python/sphinx/sphinx-5.3.0.ebuild
+2304191840 ./dev-python/sphinx/sphinx-6.1.3.ebuild
 2303030911 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
 2303252040 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.10.1.ebuild
-2303160740 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
-2304131840 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild
+2304191310 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r2.ebuild
 2303030940 ./dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.2.2.ebuild
 2302281440 ./dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3-r1.ebuild
 2303171840 ./dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
 2302162040 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.4.ebuild
 2303171840 ./dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0-r1.ebuild
 2303171840 ./dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.8.ebuild
-2303171840 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
+2304191840 ./dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.5.0.ebuild
 2303171840 ./dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
 2302171510 ./dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.2.ebuild
 2301141613 ./dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r2.ebuild
@@ -12061,10 +12078,10 @@
 2304070540 ./dev-python/sqlalchemy/sqlalchemy-1.4.47.ebuild
 2304061140 ./dev-python/sqlalchemy/sqlalchemy-2.0.4.ebuild
 2304160310 ./dev-python/sqlalchemy/sqlalchemy-2.0.9.ebuild
-2304180840 ./dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
 2304180840 ./dev-python/sqlalchemy/sqlalchemy-2.0.8.ebuild
+2304190440 ./dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
 2303160740 ./dev-python/sqlitedict/sqlitedict-2.1.0.ebuild
-2303160740 ./dev-python/sqlparse/sqlparse-0.4.3.ebuild
+2304191040 ./dev-python/sqlparse/sqlparse-0.4.4.ebuild
 2303160740 ./dev-python/sshtunnel/sshtunnel-0.3.1.ebuild
 2301141613 ./dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
 2301141613 ./dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -12148,14 +12165,14 @@
 2302140840 ./dev-python/trio/trio-0.22.0-r1.ebuild
 2303160740 ./dev-python/trustme/trustme-0.9.0-r1.ebuild
 2301141613 ./dev-python/tubes/tubes-0.2.1.ebuild
-2303030911 ./dev-python/twine/twine-4.0.2.ebuild
+2304191840 ./dev-python/twine/twine-4.0.2.ebuild
 2301141613 ./dev-python/twisted/twisted-22.10.0.ebuild
 2301141613 ./dev-python/twython/twython-3.9.1-r1.ebuild
 2301271640 ./dev-python/txAMQP/txAMQP-0.8.2-r1.ebuild
 2303171910 ./dev-python/txaio/txaio-23.1.1.ebuild
 2303160740 ./dev-python/txrequests/txrequests-0.9.6-r1.ebuild
 2303172110 ./dev-python/typed-ast/typed-ast-1.5.4.ebuild
-2304170240 ./dev-python/typeguard/typeguard-3.0.2.ebuild
+2304191840 ./dev-python/typeguard/typeguard-3.0.2.ebuild
 2303171910 ./dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
 2303160740 ./dev-python/typogrify/typogrify-2.0.7-r1.ebuild
 2301141613 ./dev-python/tzlocal/tzlocal-4.2.ebuild
@@ -12239,10 +12256,11 @@
 2303252040 ./dev-python/wtforms/wtforms-3.0.1-r1.ebuild
 2303160740 ./dev-python/wurlitzer/wurlitzer-3.0.3.ebuild
 2301141613 ./dev-python/wxpython/wxpython-4.0.7-r4.ebuild
-2303252040 ./dev-python/wxpython/wxpython-4.2.0.ebuild
+2304201410 ./dev-python/wxpython/wxpython-4.2.0.ebuild
 2303232040 ./dev-python/xarray/xarray-2023.3.0.ebuild
 2303311510 ./dev-python/xarray/xarray-2023.2.0.ebuild
 2304151440 ./dev-python/xarray/xarray-2023.4.0.ebuild
+2304190940 ./dev-python/xarray/xarray-2023.4.1.ebuild
 2302192310 ./dev-python/xcffib/xcffib-1.2.0.ebuild
 2304151140 ./dev-python/xcffib/xcffib-1.3.0.ebuild
 2302140840 ./dev-python/xdoctest/xdoctest-1.1.1.ebuild
@@ -12257,6 +12275,7 @@
 2303160740 ./dev-python/xxhash/xxhash-3.2.0.ebuild
 2303310740 ./dev-python/yamlpath/yamlpath-3.8.0.ebuild
 2302282240 ./dev-python/yapf/yapf-0.32.0-r1.ebuild
+2304190140 ./dev-python/yapf/yapf-0.33.0.ebuild
 2301141613 ./dev-python/yappi/yappi-1.4.0.ebuild
 2303040840 ./dev-python/yapsy/yapsy-1.12.2-r1.ebuild
 2301141613 ./dev-python/yarl/yarl-1.8.2.ebuild
@@ -12334,8 +12353,8 @@
 2304051540 ./dev-python/yara-python/yara-python-9999.ebuild
 2302190710 ./dev-python/autocommand/autocommand-2.2.2.ebuild
 2302031040 ./dev-python/cachecontrol/cachecontrol-0.12.11.ebuild
-2302122240 ./dev-python/pip-run/pip-run-10.0.5-r1.ebuild
-2304152310 ./dev-python/pip-run/pip-run-10.0.7.ebuild
+2304191840 ./dev-python/pip-run/pip-run-10.0.5-r1.ebuild
+2304191840 ./dev-python/pip-run/pip-run-10.0.7.ebuild
 2303090910 ./dev-python/trimesh/trimesh-3.20.2.ebuild
 2303140040 ./dev-python/trimesh/trimesh-3.19.4.ebuild
 2303212340 ./dev-python/trimesh/trimesh-3.21.0.ebuild
@@ -12355,7 +12374,7 @@
 2304051040 ./dev-python/sphinx-autoapi/sphinx-autoapi-2.1.0.ebuild
 2304142310 ./dev-python/boolean-py/boolean-py-4.0.ebuild
 2304142310 ./dev-python/license-expression/license-expression-30.1.0.ebuild
-2302071240 ./dev-python/nspektr/nspektr-0.4.0.ebuild
+2304191840 ./dev-python/nspektr/nspektr-0.4.0.ebuild
 2301271910 ./dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
 2302111040 ./dev-python/textX/textX-3.1.1.ebuild
 2301141613 ./dev-python/uri_template/uri_template-1.2.0-r1.ebuild
@@ -12372,6 +12391,7 @@
 2303160740 ./dev-python/ytmusicapi/ytmusicapi-0.25.0.ebuild
 2304030340 ./dev-python/ytmusicapi/ytmusicapi-0.25.2.ebuild
 2304082310 ./dev-python/ytmusicapi/ytmusicapi-1.0.0.ebuild
+2304200310 ./dev-python/ytmusicapi/ytmusicapi-1.0.1.ebuild
 2303301910 ./dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
 2303111310 ./dev-python/pefile/pefile-2023.2.7.ebuild
 2303111310 ./dev-python/pefile/pefile-9999.ebuild
@@ -12410,9 +12430,10 @@
 2303171640 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.4.4.ebuild
 2303111310 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
 2303171640 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.5.6.ebuild
-2303171910 ./dev-python/versioningit/versioningit-2.2.0.ebuild
+2304191840 ./dev-python/versioningit/versioningit-2.2.0.ebuild
 2302130640 ./dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
 2303250511 ./dev-python/meson-python/meson-python-0.12.1.ebuild
+2304190910 ./dev-python/meson-python/meson-python-0.13.0.ebuild
 2303192110 ./dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
 2301141613 ./dev-python/tlsh/tlsh-4.8.2.ebuild
 2301141613 ./dev-python/check-manifest/check-manifest-0.49.ebuild
@@ -12429,6 +12450,7 @@
 2303171910 ./dev-python/pyproject-fmt/pyproject-fmt-0.9.1.ebuild
 2303232010 ./dev-python/pyproject-fmt/pyproject-fmt-0.9.2.ebuild
 2304142310 ./dev-python/trove-classifiers/trove-classifiers-2023.3.9.ebuild
+2304190940 ./dev-python/trove-classifiers/trove-classifiers-2023.4.18.ebuild
 2304051610 ./dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
 2301141613 ./dev-python/ConfigArgParse/ConfigArgParse-1.5.3.ebuild
 2303171840 ./dev-python/DBUtils/DBUtils-3.0.2-r1.ebuild
@@ -12442,9 +12464,9 @@
 2303040840 ./dev-python/frozendict/frozendict-2.3.5.ebuild
 2303220940 ./dev-python/frozendict/frozendict-2.3.6.ebuild
 2304100940 ./dev-python/frozendict/frozendict-2.3.7.ebuild
-2210171540 ./dev-python/matrix-common/matrix-common-1.3.0.ebuild
+2304191840 ./dev-python/matrix-common/matrix-common-1.3.0.ebuild
 2211300910 ./dev-python/pymacaroons/pymacaroons-0.13.0-r1.ebuild
-2209221110 ./dev-python/signedjson/signedjson-1.1.4.ebuild
+2304191840 ./dev-python/signedjson/signedjson-1.1.4.ebuild
 2209221110 ./dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
 2303080810 ./dev-python/caldav/caldav-1.2.1.ebuild
 2302282240 ./dev-python/whatthepatch/whatthepatch-1.0.4.ebuild
@@ -12459,12 +12481,16 @@
 2304161210 ./dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild
 2303210910 ./dev-python/PyQt6-sip/PyQt6-sip-13.4.1.ebuild
 2304101840 ./dev-python/PyQt6-sip/PyQt6-sip-13.5.0.ebuild
-2302131910 ./dev-python/PyQt6/PyQt6-6.4.2.ebuild
-2304161210 ./dev-python/PyQt6/PyQt6-6.5.0.ebuild
+2304201940 ./dev-python/PyQt6-sip/PyQt6-sip-13.5.1.ebuild
+2304192340 ./dev-python/PyQt6/PyQt6-6.4.2.ebuild
+2304192340 ./dev-python/PyQt6/PyQt6-6.5.0.ebuild
 2210072340 ./dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild
 2304011810 ./dev-python/pyside6-tools/pyside6-tools-6.4.3.ebuild
+2304192010 ./dev-python/pyside6-tools/pyside6-tools-6.5.0.ebuild
 2304011810 ./dev-python/pyside6/pyside6-6.4.3.ebuild
+2304192010 ./dev-python/pyside6/pyside6-6.5.0.ebuild
 2304011810 ./dev-python/shiboken6/shiboken6-6.4.3.ebuild
+2304192010 ./dev-python/shiboken6/shiboken6-6.5.0.ebuild
 2211191140 ./dev-python/ensurepip-pip/ensurepip-pip-22.3.1.ebuild
 2303032110 ./dev-python/ensurepip-pip/ensurepip-pip-23.0.1.ebuild
 2304152310 ./dev-python/ensurepip-pip/ensurepip-pip-23.1.ebuild
@@ -12485,6 +12511,7 @@
 2301141613 ./dev-python/blake3-py-c/blake3-py-c-0.3.3.ebuild
 2301141613 ./dev-python/Levenshtein/Levenshtein-0.12.2.ebuild
 2304150010 ./dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
+2304200640 ./dev-python/Levenshtein/Levenshtein-0.21.0.ebuild
 2303192110 ./dev-python/linkify-it-py/linkify-it-py-2.0.0.ebuild
 2303160740 ./dev-python/rapidfuzz/rapidfuzz-2.13.7.ebuild
 2304010940 ./dev-python/rapidfuzz/rapidfuzz-2.14.0.ebuild
@@ -12499,7 +12526,8 @@
 2304081140 ./dev-python/spyder-notebook/spyder-notebook-0.4.1.ebuild
 2303030911 ./dev-python/path/path-16.6.0-r1.ebuild
 2303110910 ./dev-python/tornado/tornado-6.2.ebuild
-2304120410 ./dev-python/tornado/tornado-6.2-r1.ebuild
+2304190440 ./dev-python/tornado/tornado-6.2-r1.ebuild
+2304190940 ./dev-python/tornado/tornado-6.3.ebuild
 2303252040 ./dev-python/jack-client/jack-client-0.5.4.ebuild
 2303160710 ./dev-python/mido/mido-1.2.10.ebuild
 2303171840 ./dev-python/python-rtmidi/python-rtmidi-1.4.9.ebuild
@@ -12572,7 +12600,8 @@
 2304180610 ./dev-python/aiosqlite/aiosqlite-0.19.0.ebuild
 2303160710 ./dev-python/arsenic/arsenic-21.8.ebuild
 2303150140 ./dev-python/browser-cookie3/browser-cookie3-0.17.1.ebuild
-2304081210 ./dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
+2304190840 ./dev-python/browser-cookie3/browser-cookie3-0.18.0.ebuild
+2304191840 ./dev-python/jupyter_ydoc/jupyter_ydoc-1.0.0.ebuild
 2303111140 ./dev-python/redis/redis-4.5.1.ebuild
 2303212340 ./dev-python/redis/redis-4.5.2.ebuild
 2303232010 ./dev-python/redis/redis-4.5.3.ebuild
@@ -12609,8 +12638,8 @@
 2303030911 ./dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
 2303150910 ./dev-python/netcdf4/netcdf4-1.6.3.ebuild
 2304081210 ./dev-python/jupyter-server-ydoc/jupyter-server-ydoc-0.8.0.ebuild
-2304071710 ./dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
-2304140710 ./dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
+2304191840 ./dev-python/jupyterlab-server/jupyterlab-server-2.22.0.ebuild
+2304191840 ./dev-python/jupyterlab-server/jupyterlab-server-2.22.1.ebuild
 2304142310 ./dev-python/a2wsgi/a2wsgi-1.7.0.ebuild
 2304120410 ./dev-python/accessible-pygments/accessible-pygments-0.0.4.ebuild
 2304142310 ./dev-python/trio-websocket/trio-websocket-0.10.2.ebuild
@@ -12634,10 +12663,15 @@
 2304091240 ./dev-python/django-debug-toolbar/django-debug-toolbar-3.8.1.ebuild
 2304080840 ./dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.2.ebuild
 2304142310 ./dev-python/mkdocs-pymdownx-material-extras/mkdocs-pymdownx-material-extras-2.4.3.ebuild
-2304141640 ./dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
-2304141640 ./dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
-2304141640 ./dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
+2304191840 ./dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
+2304191840 ./dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
+2304191840 ./dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
 2304161340 ./dev-python/django-registration/django-registration-3.3.ebuild
+2304191840 ./dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
+2304191840 ./dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
+2304191840 ./dev-python/importlib-resources/importlib-resources-5.12.0.ebuild
+2304202010 ./dev-python/looseversion/looseversion-1.1.2.ebuild
+2304202010 ./dev-python/pytest-custom-exit-code/pytest-custom-exit-code-0.3.0.ebuild
 2301212240 ./dev-qt/assistant/assistant-5.15.8.ebuild
 2304140110 ./dev-qt/assistant/assistant-5.15.9.ebuild
 2301212310 ./dev-qt/designer/designer-5.15.8.ebuild
@@ -12994,7 +13028,7 @@
 2205081940 ./dev-ruby/contracts/contracts-0.16.1.ebuild
 2303220640 ./dev-ruby/contracts/contracts-0.17.ebuild
 2303251040 ./dev-ruby/contracts/contracts-0.17-r1.ebuild
-2205070940 ./dev-ruby/coolio/coolio-1.7.1-r1.ebuild
+2304192340 ./dev-ruby/coolio/coolio-1.7.1-r1.ebuild
 2205070940 ./dev-ruby/countdownlatch/countdownlatch-1.0.0-r2.ebuild
 2303282210 ./dev-ruby/crack/crack-0.4.4-r3.ebuild
 2304012340 ./dev-ruby/crass/crass-1.0.6-r1.ebuild
@@ -13019,6 +13053,7 @@
 2303310412 ./dev-ruby/ddmetrics/ddmetrics-1.0.1-r1.ebuild
 2204030939 ./dev-ruby/ddplugin/ddplugin-1.0.3.ebuild
 2205061310 ./dev-ruby/debug_inspector/debug_inspector-1.1.0.ebuild
+2304192340 ./dev-ruby/debug_inspector/debug_inspector-1.1.0-r1.ebuild
 2303282210 ./dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
 2205061310 ./dev-ruby/delayer-deferred/delayer-deferred-2.2.0.ebuild
 2303271140 ./dev-ruby/delayer/delayer-1.2.1.ebuild
@@ -13177,7 +13212,7 @@
 2203310910 ./dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
 2303180310 ./dev-ruby/introspection/introspection-0.0.4-r1.ebuild
 2304171310 ./dev-ruby/introspection/introspection-0.0.4-r2.ebuild
-2205040840 ./dev-ruby/itextomml/itextomml-1.6.1.ebuild
+2304192340 ./dev-ruby/itextomml/itextomml-1.6.1.ebuild
 2210022010 ./dev-ruby/jbuilder/jbuilder-2.11.5.ebuild
 2205030740 ./dev-ruby/jmespath/jmespath-1.6.1.ebuild
 2207221210 ./dev-ruby/jmespath/jmespath-1.6.1-r1.ebuild
@@ -13342,6 +13377,7 @@
 2304140910 ./dev-ruby/ox/ox-2.14.16.ebuild
 2207060840 ./dev-ruby/paint/paint-2.3.0.ebuild
 2304020840 ./dev-ruby/parallel/parallel-1.22.1.ebuild
+2304192210 ./dev-ruby/parallel/parallel-1.23.0.ebuild
 2303290110 ./dev-ruby/paramesan/paramesan-1.0.1-r1.ebuild
 2211281010 ./dev-ruby/parser/parser-3.1.3.0.ebuild
 2301081110 ./dev-ruby/parser/parser-3.2.0.0.ebuild
@@ -13573,6 +13609,7 @@
 2212072310 ./dev-ruby/ruby-shadow/ruby-shadow-2.5.1.ebuild
 2207301140 ./dev-ruby/ruby-shout/ruby-shout-2.2.2-r2.ebuild
 2212041241 ./dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
+2304192210 ./dev-ruby/ruby-termios/ruby-termios-1.1.0-r2.ebuild
 2206230910 ./dev-ruby/ruby-xslt/ruby-xslt-0.9.10-r1.ebuild
 2204301240 ./dev-ruby/ruby-yadis/ruby-yadis-0.3.4-r3.ebuild
 2304070740 ./dev-ruby/ruby2_keywords/ruby2_keywords-0.0.5-r1.ebuild
@@ -13600,7 +13637,7 @@
 2304050140 ./dev-ruby/rubyzip/rubyzip-2.3.2-r1.ebuild
 2303251040 ./dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
 2304010940 ./dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild
-2301281210 ./dev-ruby/sanitize/sanitize-6.0.1.ebuild
+2304192340 ./dev-ruby/sanitize/sanitize-6.0.1.ebuild
 2206282010 ./dev-ruby/sass-listen/sass-listen-4.0.0-r1.ebuild
 2304081010 ./dev-ruby/sass-rails/sass-rails-5.1.0-r1.ebuild
 2304072140 ./dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
@@ -13987,13 +14024,13 @@
 2212242040 ./dev-tcltk/mysqltcl/mysqltcl-3.052-r1.ebuild
 1911121409 ./dev-tcltk/scwoop/scwoop-4.1-r1.ebuild
 2301161110 ./dev-tcltk/snack/snack-2.2.10-r11.ebuild
-2302262210 ./dev-tcltk/snack/snack-2.2.10-r12.ebuild
+2304200710 ./dev-tcltk/snack/snack-2.2.10-r12.ebuild
 2111052039 ./dev-tcltk/tablelist/tablelist-6.15.1.ebuild
 2303182040 ./dev-tcltk/tcl3d/tcl3d-0.5.0-r1.ebuild
 2104060140 ./dev-tcltk/tcllib/tcllib-1.20.ebuild
 2212021440 ./dev-tcltk/tcllib/tcllib-1.21.ebuild
 2301141613 ./dev-tcltk/tclpython/tclpython-5.0-r1.ebuild
-2302262210 ./dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
+2304200710 ./dev-tcltk/tclpython/tclpython-5.0-r2.ebuild
 2002111439 ./dev-tcltk/tclreadline/tclreadline-2.1.0-r5.ebuild
 2211230410 ./dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
 2303160040 ./dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
@@ -14141,7 +14178,7 @@
 2303020310 ./dev-util/android-studio/android-studio-2022.1.1.21.ebuild
 2304131940 ./dev-util/android-studio/android-studio-2022.3.1.11.ebuild
 2301270840 ./dev-util/android-tools/android-tools-33.0.3-r1.ebuild
-2303130310 ./dev-util/android-tools/android-tools-34.0.0.ebuild
+2304191440 ./dev-util/android-tools/android-tools-34.0.0.ebuild
 2205151240 ./dev-util/anjuta/anjuta-3.34.0-r2.ebuild
 2301141613 ./dev-util/apitrace/apitrace-9.0-r3.ebuild
 2202121409 ./dev-util/archdiff/archdiff-1.1.6-r1.ebuild
@@ -14279,7 +14316,7 @@
 2111080609 ./dev-util/cpputest/cpputest-4.0.ebuild
 2212030040 ./dev-util/cproto/cproto-4.7t-r1.ebuild
 2212290640 ./dev-util/cproto/cproto-4.7u-r1.ebuild
-2303010840 ./dev-util/cproto/cproto-4.7v.ebuild
+2304190940 ./dev-util/cproto/cproto-4.7v.ebuild
 2112310709 ./dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
 2303162210 ./dev-util/cram/cram-0.7-r2.ebuild
 2204091409 ./dev-util/crash/crash-7.3.1.ebuild
@@ -14344,7 +14381,7 @@
 2304010040 ./dev-util/diffoscope/diffoscope-240.ebuild
 2212182210 ./dev-util/diffstat/diffstat-1.65.ebuild
 2301141613 ./dev-util/diffuse/diffuse-0.7.5.ebuild
-2301301910 ./dev-util/diffuse/diffuse-0.7.7.ebuild
+2304191440 ./dev-util/diffuse/diffuse-0.7.7.ebuild
 2212072110 ./dev-util/dirdiff/dirdiff-2.1-r4.ebuild
 1702282250 ./dev-util/dissembler/dissembler-0.9-r1.ebuild
 2101070210 ./dev-util/dmake/dmake-4.12.2.ebuild
@@ -14406,6 +14443,7 @@
 2304180310 ./dev-util/glslang/glslang-1.3.243.ebuild
 2301141613 ./dev-util/gn/gn-0.2049.ebuild
 2303241640 ./dev-util/gn/gn-0.2077.ebuild
+2304191940 ./dev-util/gn/gn-0.2088.ebuild
 2303210140 ./dev-util/gnome-builder/gnome-builder-44.1.ebuild
 2303302110 ./dev-util/gnome-builder/gnome-builder-43.6.ebuild
 2108150439 ./dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
@@ -14441,12 +14479,13 @@
 2112210740 ./dev-util/icemon/icemon-3.3.ebuild
 2103100439 ./dev-util/icmake/icmake-9.03.01.ebuild
 2303282340 ./dev-util/idea-community/idea-community-2023.1.ebuild
-2208241340 ./dev-util/ignition-cmake/ignition-cmake-2.14.0.ebuild
+2304181640 ./dev-util/ignition-cmake/ignition-cmake-2.16.0.ebuild
 2301152010 ./dev-util/imediff2/imediff2-1.1.2.1.ebuild
 2301141613 ./dev-util/include-what-you-use/include-what-you-use-0.19.ebuild
 2204200309 ./dev-util/indent/indent-2.2.12.ebuild
 2303220710 ./dev-util/indent/indent-2.2.13.ebuild
 2304092240 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
+2304190010 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
 2303040310 ./dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.8.7.ebuild
 2211211140 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-18.1.0.015.ebuild
 2206211940 ./dev-util/intltool/intltool-0.51.0-r3.ebuild
@@ -14493,8 +14532,9 @@
 2302260710 ./dev-util/lldb/lldb-17.0.0.9999.ebuild
 2303251440 ./dev-util/lldb/lldb-17.0.0_pre20230325.ebuild
 2304052140 ./dev-util/lldb/lldb-16.0.1.ebuild
-2304050940 ./dev-util/lldb/lldb-16.0.2.9999.ebuild
 2304142240 ./dev-util/lldb/lldb-17.0.0_pre20230414.ebuild
+2304192310 ./dev-util/lldb/lldb-16.0.2.ebuild
+2304191910 ./dev-util/lldb/lldb-16.0.3.9999.ebuild
 2203200410 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2303310140 ./dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -14523,9 +14563,8 @@
 2301131810 ./dev-util/makeheaders/makeheaders-0_p20220411.ebuild
 2104042139 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 2209232340 ./dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
-2304051810 ./dev-util/maturin/maturin-0.14.16.ebuild
 2304051810 ./dev-util/maturin/maturin-1.0.0_beta7.ebuild
-2304061810 ./dev-util/maturin/maturin-0.14.17.ebuild
+2304190910 ./dev-util/maturin/maturin-0.14.17.ebuild
 2208121540 ./dev-util/mdds/mdds-2.0.3.ebuild
 2302251340 ./dev-util/mdds/mdds-9999.ebuild
 2301141613 ./dev-util/meld/meld-3.22.0-r2.ebuild
@@ -14614,7 +14653,7 @@
 2212041910 ./dev-util/ragel/ragel-6.10.ebuild
 2212251340 ./dev-util/ragel/ragel-7.0.4-r2.ebuild
 2211250910 ./dev-util/rats/rats-2.4-r2.ebuild
-2301141613 ./dev-util/rbtools/rbtools-4.0-r1.ebuild
+2304191840 ./dev-util/rbtools/rbtools-4.0-r1.ebuild
 2105101839 ./dev-util/re2c/re2c-2.1.1-r1.ebuild
 2301141613 ./dev-util/re2c/re2c-2.2.ebuild
 2006212039 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -14625,8 +14664,8 @@
 2206201810 ./dev-util/regexxer/regexxer-0.10-r2.ebuild
 1911102139 ./dev-util/rej/rej-0.16-r1.ebuild
 2302190410 ./dev-util/rizin/rizin-0.4.1.ebuild
-2302220440 ./dev-util/rizin/rizin-0.5.1.ebuild
 2304162210 ./dev-util/rizin/rizin-0.5.2.ebuild
+2304190940 ./dev-util/rizin/rizin-0.5.1.ebuild
 2009210009 ./dev-util/rocm-cmake/rocm-cmake-9999.ebuild
 2208061740 ./dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild
 2212201240 ./dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild
@@ -14785,7 +14824,7 @@
 2212030040 ./dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
 2212272310 ./dev-util/yacc/yacc-1.9.1-r7.ebuild
 2301141613 ./dev-util/ydiff/ydiff-1.2.ebuild
-2303162210 ./dev-util/ydiff/ydiff-1.2-r1.ebuild
+2304200810 ./dev-util/ydiff/ydiff-1.2-r1.ebuild
 2302070610 ./dev-util/yamllint/yamllint-1.28.0.ebuild
 2303230310 ./dev-util/yamllint/yamllint-1.29.0.ebuild
 2303230310 ./dev-util/yamllint/yamllint-1.30.0.ebuild
@@ -14822,16 +14861,17 @@
 2204010410 ./dev-util/wachy/wachy-0.1.0_alpha6.ebuild
 2302101210 ./dev-util/ROPgadget/ROPgadget-9999.ebuild
 2302170210 ./dev-util/ROPgadget/ROPgadget-7.2.ebuild
-2303190640 ./dev-util/ROPgadget/ROPgadget-7.3.ebuild
+2304190940 ./dev-util/ROPgadget/ROPgadget-7.3.ebuild
 2301310511 ./dev-util/pwndbg/pwndbg-99999999.ebuild
 2303051040 ./dev-util/pwndbg/pwndbg-20221219-r2.ebuild
-2303200910 ./dev-util/pwndbg/pwndbg-20230319.ebuild
+2304190940 ./dev-util/pwndbg/pwndbg-20230319.ebuild
 2302140840 ./dev-util/gitchangelog/gitchangelog-3.1.2.ebuild
 2212201240 ./dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.3.3.ebuild
 2303021210 ./dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.4.3.ebuild
 2211230010 ./dev-util/gpp/gpp-2.27.ebuild
 2211121440 ./dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p1-r2.ebuild
 2302020010 ./dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p2.ebuild
+2304190740 ./dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p3.ebuild
 2301141613 ./dev-util/snakeviz/snakeviz-2.1.1.ebuild
 2211102240 ./dev-util/web_page_replay_go/web_page_replay_go-20221028.ebuild
 2303111110 ./dev-util/breakpad/breakpad-2022.07.12.ebuild
@@ -14876,9 +14916,9 @@
 2212231110 ./dev-util/bindgen/bindgen-0.62.0.ebuild
 2212231110 ./dev-util/bindgen/bindgen-0.63.0.ebuild
 2212260040 ./dev-util/fq/fq-0.2.0-r1.ebuild
-2303090410 ./dev-util/fq/fq-0.4.0.ebuild
 2303220842 ./dev-util/fq/fq-0.3.0.ebuild
 2304132240 ./dev-util/fq/fq-0.5.0.ebuild
+2304190940 ./dev-util/fq/fq-0.4.0.ebuild
 2301092310 ./dev-util/gitlab-cli/gitlab-cli-1.24.1.ebuild
 2302110140 ./dev-util/gitlab-cli/gitlab-cli-1.25.3.ebuild
 2303282240 ./dev-util/gitlab-cli/gitlab-cli-1.26.0.ebuild
@@ -14915,8 +14955,8 @@
 2303190511 ./dev-vcs/git-annex/git-annex-10.20220624.ebuild
 2303171840 ./dev-vcs/git-big-picture/git-big-picture-1.2.2-r1.ebuild
 2301141613 ./dev-vcs/git-cola/git-cola-4.0.1.ebuild
-2301252110 ./dev-vcs/git-cola/git-cola-4.1.0.ebuild
 2304151540 ./dev-vcs/git-cola/git-cola-4.2.1.ebuild
+2304201540 ./dev-vcs/git-cola/git-cola-4.1.0.ebuild
 2211020240 ./dev-vcs/git-crypt/git-crypt-0.6.0-r1.ebuild
 2212011910 ./dev-vcs/git-crypt/git-crypt-0.7.0.ebuild
 2204250610 ./dev-vcs/git-extras/git-extras-6.4.0.ebuild
@@ -14948,7 +14988,7 @@
 2107100239 ./dev-vcs/gitolite/gitolite-2.3.1-r2.ebuild
 2201170309 ./dev-vcs/gitolite/gitolite-3.6.11-r1.ebuild
 2205082340 ./dev-vcs/gitolite/gitolite-3.6.12.ebuild
-2301141613 ./dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
+2304191110 ./dev-vcs/gitstats/gitstats-0_pre20201124.ebuild
 2002112051 ./dev-vcs/guilt/guilt-0.36-r1.ebuild
 2303261110 ./dev-vcs/hg-evolve/hg-evolve-11.0.1.ebuild
 2301141613 ./dev-vcs/hg-git/hg-git-0.10.3.ebuild
@@ -15001,6 +15041,7 @@
 2303071510 ./dev-vcs/git-machete/git-machete-3.14.3.ebuild
 2303131510 ./dev-vcs/git-machete/git-machete-3.16.1.ebuild
 2304060040 ./dev-vcs/git-machete/git-machete-3.16.3.ebuild
+2304191110 ./dev-vcs/git-machete/git-machete-3.17.0.ebuild
 2302212110 ./dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.3.1.ebuild
 2303171840 ./dev-vcs/git-delete-merged-branches/git-delete-merged-branches-7.4.0.ebuild
 2303172140 ./dev-vcs/git-repair/git-repair-1.20220404.ebuild
@@ -15121,7 +15162,7 @@
 2108070610 ./games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
 2108022139 ./games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
 2208112210 ./games-arcade/cob/cob-0.9-r2.ebuild
-2302251340 ./games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
+2304190640 ./games-arcade/commandergenius/commandergenius-2.4.0-r1.ebuild
 2210070910 ./games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
 2108190409 ./games-arcade/cosmosmash/cosmosmash-1.4.8-r1.ebuild
 2104071139 ./games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -15344,7 +15385,7 @@
 2106190039 ./games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.9-r2.ebuild
 1909151309 ./games-emulation/mupen64plus/mupen64plus-2.5.9.ebuild
 2301210210 ./games-emulation/nestopia/nestopia-1.52.0.ebuild
-2209070511 ./games-emulation/openmsx/openmsx-18.0-r2.ebuild
+2304190640 ./games-emulation/openmsx/openmsx-18.0-r2.ebuild
 2205170840 ./games-emulation/pcsx2/pcsx2-1.6.0-r3.ebuild
 2302030210 ./games-emulation/pcsx2/pcsx2-1.7.3738.ebuild
 2303281110 ./games-emulation/pcsx2/pcsx2-1.7.4280.ebuild
@@ -15352,7 +15393,7 @@
 2102202239 ./games-emulation/pcsxr/pcsxr-1.9.94_p20190306.ebuild
 2006081209 ./games-emulation/pcsxr/pcsxr-9999.ebuild
 2303071910 ./games-emulation/ppsspp/ppsspp-1.14.2-r2.ebuild
-2304042240 ./games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
+2304190640 ./games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
 2203051040 ./games-emulation/snes9x/snes9x-1.61.ebuild
 2303311110 ./games-emulation/snes9x/snes9x-1.62.3.ebuild
 2206220410 ./games-emulation/stella/stella-6.7.ebuild
@@ -15733,8 +15774,8 @@
 1912062339 ./games-rpg/hatoful-boyfriend/hatoful-boyfriend-0-r1.ebuild
 2012010209 ./games-rpg/kqlives/kqlives-0.99-r100.ebuild
 2107272139 ./games-rpg/lure/lure-1.1-r1.ebuild
-2207010040 ./games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
 2206300410 ./games-rpg/manaplus/manaplus-9999.ebuild
+2304190740 ./games-rpg/manaplus/manaplus-1.9.3.23-r1.ebuild
 2201041139 ./games-rpg/openglad/openglad-0.98_p20200907.ebuild
 2107180839 ./games-rpg/pcgen/pcgen-6.06.01.ebuild
 2104212209 ./games-rpg/queen/queen-1-r1.ebuild
@@ -15758,15 +15799,13 @@
 2106302209 ./games-server/crossfire-server/crossfire-server-1.71.0-r2.ebuild
 2108230739 ./games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
 1702282250 ./games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild
-2301311840 ./games-server/minecraft-server/minecraft-server-1.19.3.ebuild
-2303200140 ./games-server/minecraft-server/minecraft-server-1.19.4.ebuild
+2304192210 ./games-server/minecraft-server/minecraft-server-1.19.4.ebuild
 2104161439 ./games-server/monopd/monopd-0.10.2-r1.ebuild
 2210082110 ./games-server/mtavc/mtavc-0.5-r2.ebuild
 2104100113 ./games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild
 2202100210 ./games-server/steamcmd/steamcmd-1.0-r4.ebuild
 2108230739 ./games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
-2207011140 ./games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild
-2303211440 ./games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
+2304201740 ./games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild
 1805012309 ./games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
 2211221710 ./games-simulation/corsix-th/corsix-th-0.66-r1.ebuild
 2107191909 ./games-simulation/crashtest/crashtest-1.1-r2.ebuild
@@ -15779,9 +15818,8 @@
 2108040539 ./games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
 2303050640 ./games-simulation/lincity/lincity-1.13.1-r4.ebuild
 2104250109 ./games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
-2301311840 ./games-simulation/openrct2/openrct2-0.4.3.ebuild
-2304030040 ./games-simulation/openrct2/openrct2-0.4.4.ebuild
 2304012310 ./games-simulation/openrct2/openrct2-9999.ebuild
+2304190010 ./games-simulation/openrct2/openrct2-0.4.4.ebuild
 2302090040 ./games-simulation/openttd/openttd-13.0.ebuild
 2304161040 ./games-simulation/openttd/openttd-13.1.ebuild
 2106190039 ./games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
@@ -15811,7 +15849,7 @@
 2304081710 ./games-strategy/colobot-data/colobot-data-0.2.0_alpha.ebuild
 2108191039 ./games-strategy/colobot/colobot-0.1.12.ebuild
 2104120539 ./games-strategy/colobot/colobot-9999.ebuild
-2211181740 ./games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+2304190740 ./games-strategy/colobot/colobot-0.2.0_alpha.ebuild
 1912062339 ./games-strategy/crimson/crimson-0.5.3-r1.ebuild
 2210082110 ./games-strategy/darwinia-demo/darwinia-demo-1.3.0-r3.ebuild
 2210082110 ./games-strategy/darwinia/darwinia-1.4.0_beta9-r3.ebuild
@@ -15864,7 +15902,7 @@
 2301141613 ./games-strategy/widelands/widelands-9999.ebuild
 2301270840 ./games-strategy/widelands/widelands-1.1.ebuild
 2104121909 ./games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
-2302161210 ./games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
+2304190640 ./games-strategy/endless-sky/endless-sky-0.9.16.1.ebuild
 2104082309 ./games-util/acc/acc-1.58.ebuild
 2106132109 ./games-util/antimicro/antimicro-2.23.ebuild
 2109280109 ./games-util/atlas/atlas-0.6.1_beta_pre20181202.ebuild
@@ -15948,6 +15986,7 @@
 2303210040 ./gnome-base/gnome-session/gnome-session-44.0.ebuild
 2301141613 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-43.0.ebuild
 2303212240 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-44.0.ebuild
+2304181910 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-44.1.ebuild
 2303200310 ./gnome-base/gnome-shell/gnome-shell-44.0.ebuild
 2303302110 ./gnome-base/gnome-shell/gnome-shell-43.3.ebuild
 2304101610 ./gnome-base/gnome-shell/gnome-shell-43.4.ebuild
@@ -16016,16 +16055,16 @@
 2303071540 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-50.ebuild
 2303161540 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-53.ebuild
 2212041810 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-16.ebuild
+2304181740 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-16-r1.ebuild
 2302241810 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-44.ebuild
-2304092140 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild
-2212041810 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-30.ebuild
-2302241810 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild
+2304181740 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-45.ebuild
+2304181740 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-33.ebuild
 2212171010 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323-r1.ebuild
 2304171810 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20230408.ebuild
 2212041810 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-52.ebuild
-2303161540 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-55.ebuild
 2304092140 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-56.ebuild
 2212041810 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.ebuild
+2304181740 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
 2301221440 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-54_p20221214.ebuild
 2303262010 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-55.ebuild
 2208010540 ./gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1.ebuild
@@ -16060,8 +16099,8 @@
 2304012210 ./gnome-extra/nm-applet/nm-applet-1.30.0-r2.ebuild
 2304170410 ./gnome-extra/nm-applet/nm-applet-1.32.0.ebuild
 2107101909 ./gnome-extra/office-runner/office-runner-1.0.3.ebuild
-2302260310 ./gnome-extra/pch-session/pch-session-42.0-r1.ebuild
-2302260310 ./gnome-extra/pch-session/pch-session-43.2-r1.ebuild
+2304181740 ./gnome-extra/pch-session/pch-session-43.2-r1.ebuild
+2304181740 ./gnome-extra/pch-session/pch-session-44.0.ebuild
 2205181110 ./gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
 2212171010 ./gnome-extra/sushi/sushi-43.0.ebuild
 2301232140 ./gnome-extra/synapse/synapse-0.2.99.4-r2.ebuild
@@ -16070,10 +16109,11 @@
 2303302110 ./gnome-extra/zenity/zenity-3.44.0.ebuild
 2304171810 ./gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-29.0.ebuild
 2212171010 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20221024.ebuild
+2304181740 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20221024-r1.ebuild
 2301141613 ./gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
 2301141613 ./gnome-extra/gnome-browser-connector/gnome-browser-connector-42.1.ebuild
 2212041810 ./gnome-extra/gnome-firmware/gnome-firmware-43.0.ebuild
-2302241810 ./gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild
+2304181840 ./gnome-extra/gnome-firmware/gnome-firmware-43.2.ebuild
 2301141613 ./gnome-extra/gnome-network-displays/gnome-network-displays-0.90.5.ebuild
 2301300840 ./gnome-extra/krb5-auth-dialog/krb5-auth-dialog-43.0-r1.ebuild
 2009181809 ./gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
@@ -16511,8 +16551,8 @@
 2303112140 ./kde-frameworks/breeze-icons/breeze-icons-5.104.0.ebuild
 2304081740 ./kde-frameworks/breeze-icons/breeze-icons-5.105.0.ebuild
 2302181940 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild
-2303112140 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
 2304081740 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.105.0.ebuild
+2304200810 ./kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild
 2302181940 ./kde-frameworks/frameworkintegration/frameworkintegration-5.102.0.ebuild
 2303112140 ./kde-frameworks/frameworkintegration/frameworkintegration-5.104.0.ebuild
 2304081740 ./kde-frameworks/frameworkintegration/frameworkintegration-5.105.0.ebuild
@@ -16798,7 +16838,7 @@
 2302011010 ./kde-plasma/kmenuedit/kmenuedit-5.26.5.ebuild
 2304042240 ./kde-plasma/kmenuedit/kmenuedit-5.27.4.ebuild
 2302011010 ./kde-plasma/kscreen/kscreen-5.26.5.ebuild
-2304100210 ./kde-plasma/kscreen/kscreen-5.27.4-r1.ebuild
+2304182110 ./kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
 2302011010 ./kde-plasma/kscreenlocker/kscreenlocker-5.26.5.ebuild
 2304042240 ./kde-plasma/kscreenlocker/kscreenlocker-5.27.4.ebuild
 2302011010 ./kde-plasma/ksshaskpass/ksshaskpass-5.26.5.ebuild
@@ -16818,7 +16858,7 @@
 2302011010 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.26.5.ebuild
 2304042240 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.27.4.ebuild
 2302020110 ./kde-plasma/libkscreen/libkscreen-5.26.5.ebuild
-2304100210 ./kde-plasma/libkscreen/libkscreen-5.27.4-r1.ebuild
+2304191540 ./kde-plasma/libkscreen/libkscreen-5.27.4-r2.ebuild
 2302011010 ./kde-plasma/libksysguard/libksysguard-5.26.5-r1.ebuild
 2304042240 ./kde-plasma/libksysguard/libksysguard-5.27.4.ebuild
 2302011010 ./kde-plasma/libkworkspace/libkworkspace-5.26.5.ebuild
@@ -16840,7 +16880,7 @@
 2302011010 ./kde-plasma/plasma-meta/plasma-meta-5.26.5.ebuild
 2304042240 ./kde-plasma/plasma-meta/plasma-meta-5.27.4.ebuild
 2302011010 ./kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild
-2304042240 ./kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild
+2304192210 ./kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
 2302011010 ./kde-plasma/plasma-pa/plasma-pa-5.26.5.ebuild
 2304042240 ./kde-plasma/plasma-pa/plasma-pa-5.27.4.ebuild
 2302011010 ./kde-plasma/plasma-sdk/plasma-sdk-5.26.5.ebuild
@@ -16873,7 +16913,7 @@
 2304042240 ./kde-plasma/oxygen-sounds/oxygen-sounds-5.27.4.ebuild
 2302011010 ./kde-plasma/kpipewire/kpipewire-5.26.5.ebuild
 2304130040 ./kde-plasma/kpipewire/kpipewire-5.27.4-r1.ebuild
-2304042240 ./kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild
+2304192310 ./kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
 2304051640 ./kde-plasma/flatpak-kcm/flatpak-kcm-5.27.4.ebuild
 2207120540 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r2.ebuild
 2207120540 ./lxde-base/lxappearance/lxappearance-0.6.3-r3.ebuild
@@ -16975,7 +17015,7 @@
 2201271240 ./mail-filter/bogofilter/bogofilter-1.2.5-r1.ebuild
 2301141613 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.2-r1.ebuild
 2301141613 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.3.ebuild
-2302262240 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
+2304191310 ./mail-filter/courier-pythonfilter/courier-pythonfilter-3.0.4.ebuild
 2104031909 ./mail-filter/couriersrs/couriersrs-0.1.2.ebuild
 2101201239 ./mail-filter/dcc/dcc-1.3.158-r1.ebuild
 2210111210 ./mail-filter/dcc/dcc-1.3.158-r2.ebuild
@@ -17060,6 +17100,7 @@
 2303061710 ./mail-mta/postfix/postfix-3.7.4.ebuild
 2304171610 ./mail-mta/postfix/postfix-3.8.0.ebuild
 2304171610 ./mail-mta/postfix/postfix-3.9_pre20230416.ebuild
+2304201940 ./mail-mta/postfix/postfix-3.7.5.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
 2212140512 ./mail-mta/sendmail/sendmail-8.17.1.9.ebuild
@@ -17362,7 +17403,7 @@
 2303150010 ./media-gfx/argyllcms/argyllcms-2.3.1-r1.ebuild
 2011261339 ./media-gfx/arss/arss-0.2.3-r1.ebuild
 2301141613 ./media-gfx/asymptote/asymptote-2.83.ebuild
-2302161410 ./media-gfx/asymptote/asymptote-2.85-r1.ebuild
+2304191510 ./media-gfx/asymptote/asymptote-2.85-r1.ebuild
 2212160511 ./media-gfx/autopano-sift-C/autopano-sift-C-2.5.1-r1.ebuild
 2212091010 ./media-gfx/aview/aview-1.3.0_rc1-r3.ebuild
 2302170840 ./media-gfx/blender/blender-2.93.13.ebuild
@@ -17384,7 +17425,7 @@
 2301141613 ./media-gfx/cropgui/cropgui-0.6-r1.ebuild
 2302211140 ./media-gfx/cropgui/cropgui-0.6-r2.ebuild
 2012311940 ./media-gfx/crwinfo/crwinfo-0.2.ebuild
-2302141940 ./media-gfx/cura/cura-4.13.1-r1.ebuild
+2304191840 ./media-gfx/cura/cura-4.13.1-r1.ebuild
 2205082310 ./media-gfx/curaengine/curaengine-4.13.1.ebuild
 2303260110 ./media-gfx/darktable/darktable-4.2.1.ebuild
 1805191409 ./media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -17421,6 +17462,7 @@
 2205082310 ./media-gfx/fdm-materials/fdm-materials-4.13.0.ebuild
 2211080810 ./media-gfx/feh/feh-3.9.1.ebuild
 2303222110 ./media-gfx/feh/feh-3.9.1-r1.ebuild
+2304190040 ./media-gfx/feh/feh-3.10.ebuild
 2101021609 ./media-gfx/figurine/figurine-1.0.5-r1.ebuild
 2106040039 ./media-gfx/flam3/flam3-3.1.1.ebuild
 2202271639 ./media-gfx/flameshot/flameshot-11.0.0.ebuild
@@ -17544,8 +17586,8 @@
 2212160511 ./media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild
 2301141613 ./media-gfx/mcomix/mcomix-1.3.0_pre20211015.ebuild
 2301141613 ./media-gfx/mcomix/mcomix-2.0.2-r1.ebuild
-2301141613 ./media-gfx/mcomix/mcomix-2.1.0.ebuild
 2301141613 ./media-gfx/mcomix/mcomix-9999.ebuild
+2304200810 ./media-gfx/mcomix/mcomix-2.1.0.ebuild
 2106032239 ./media-gfx/meshlab/meshlab-2020.12-r1.ebuild
 1806091709 ./media-gfx/metapixel/metapixel-1.0.2-r1.ebuild
 2205251240 ./media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -17679,6 +17721,7 @@
 2207221210 ./media-gfx/ttfautohint/ttfautohint-1.8.4-r3.ebuild
 2304022310 ./media-gfx/skanpage/skanpage-22.12.3.ebuild
 2212290140 ./media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild
+2304190040 ./media-gfx/superslicer/superslicer-2.5.59.2.ebuild
 2209080140 ./media-gfx/oxipng/oxipng-6.0.0.ebuild
 2209080310 ./media-gfx/oxipng/oxipng-6.0.1.ebuild
 2212241110 ./media-gfx/oxipng/oxipng-7.0.0.ebuild
@@ -17897,7 +17940,7 @@
 2301061140 ./media-libs/libde265/libde265-1.0.9.ebuild
 2303110740 ./media-libs/libde265/libde265-1.0.11.ebuild
 2303110740 ./media-libs/libde265/libde265-9999.ebuild
-2304051610 ./media-libs/libdiscid/libdiscid-0.6.4.ebuild
+2304201410 ./media-libs/libdiscid/libdiscid-0.6.4.ebuild
 2208121510 ./media-libs/libdmtx/libdmtx-0.7.7.ebuild
 2211020910 ./media-libs/libdv/libdv-1.0.0-r4.ebuild
 2110160409 ./media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -17996,7 +18039,7 @@
 2203222209 ./media-libs/libnsbmp/libnsbmp-0.1.6-r1.ebuild
 2212010640 ./media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
 2203222209 ./media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
-2211240440 ./media-libs/libofa/libofa-0.9.3-r3.ebuild
+2304201410 ./media-libs/libofa/libofa-0.9.3-r3.ebuild
 2211230640 ./media-libs/libogg/libogg-1.3.5-r1.ebuild
 2204140710 ./media-libs/liboggz/liboggz-1.1.1.ebuild
 2103170439 ./media-libs/libopenaptx/libopenaptx-9999.ebuild
@@ -18075,7 +18118,7 @@
 2208121540 ./media-libs/libvisio/libvisio-0.1.7.ebuild
 2208121540 ./media-libs/libvisio/libvisio-9999.ebuild
 2301222210 ./media-libs/libvisual/libvisual-0.4.1.ebuild
-2303200710 ./media-libs/libvisual/libvisual-0.4.2.ebuild
+2304191740 ./media-libs/libvisual/libvisual-0.4.2-r1.ebuild
 2211230640 ./media-libs/libvorbis/libvorbis-1.3.7-r1.ebuild
 2211060740 ./media-libs/libvpx/libvpx-1.12.0-r1.ebuild
 2212160511 ./media-libs/libwebp/libwebp-1.1.0-r1.ebuild
@@ -18138,6 +18181,7 @@
 2203202010 ./media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
 2304071610 ./media-libs/opensubdiv/opensubdiv-3.5.0.ebuild
 2211230640 ./media-libs/opus/opus-1.3.1-r4.ebuild
+2304201910 ./media-libs/opus/opus-1.4.ebuild
 2212221640 ./media-libs/opusfile/opusfile-0.12-r1.ebuild
 2301141613 ./media-libs/osl/osl-1.12.7.0.ebuild
 2301141613 ./media-libs/partio/partio-1.14.6.ebuild
@@ -18168,10 +18212,9 @@
 2212050840 ./media-libs/rlottie/rlottie-0.2_p20210405.ebuild
 2211220710 ./media-libs/rnnoise/rnnoise-0.4.1_p20210122-r1.ebuild
 2204101640 ./media-libs/rtaudio/rtaudio-5.2.0.ebuild
-2212210810 ./media-libs/rubberband/rubberband-3.1.1-r1.ebuild
-2303192110 ./media-libs/rubberband/rubberband-3.1.2.ebuild
 2303290910 ./media-libs/rubberband/rubberband-3.1.3.ebuild
 2304061510 ./media-libs/rubberband/rubberband-3.2.1.ebuild
+2304191440 ./media-libs/rubberband/rubberband-3.1.2.ebuild
 2211241510 ./media-libs/sbc/sbc-2.0.ebuild
 2212051240 ./media-libs/sdl-gfx/sdl-gfx-2.0.26-r1.ebuild
 2212160511 ./media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
@@ -18781,7 +18824,7 @@
 2205281910 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r2.ebuild
 2301090040 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r3.ebuild
 2301222210 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.1.ebuild
-2303200710 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild
+2304191310 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.2.ebuild
 2303260940 ./media-plugins/libvisual-projectm/libvisual-projectm-2.1.1.ebuild
 2212030940 ./media-plugins/live/live-2021.08.24.ebuild
 1912221509 ./media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
@@ -19156,7 +19199,7 @@
 2301141613 ./media-sound/lilypond/lilypond-2.23.0-r1.ebuild
 2301141613 ./media-sound/lilypond/lilypond-2.23.2-r1.ebuild
 2301141613 ./media-sound/lilypond/lilypond-9999.ebuild
-2302080110 ./media-sound/lilypond/lilypond-2.24.0.ebuild
+2304200710 ./media-sound/lilypond/lilypond-2.24.0.ebuild
 2211191640 ./media-sound/lingot/lingot-1.1.1.ebuild
 2110170409 ./media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
 2110170409 ./media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -19168,7 +19211,7 @@
 2302252310 ./media-sound/lollypop/lollypop-1.4.35.ebuild
 2304050210 ./media-sound/lollypop/lollypop-1.4.37.ebuild
 2211162210 ./media-sound/lxmusic/lxmusic-0.4.7-r2.ebuild
-2212071710 ./media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+2304201410 ./media-sound/mac/mac-4.11.4.5.7-r1.ebuild
 2108170039 ./media-sound/madplay/madplay-0.15.2b-r2.ebuild
 2106291909 ./media-sound/mangler/mangler-1.2.5-r3.ebuild
 1912100409 ./media-sound/mcdp/mcdp-0.4b.ebuild
@@ -19400,7 +19443,7 @@
 1910180209 ./media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
 1910102139 ./media-sound/xfmpc/xfmpc-0.3.0.ebuild
 2203202209 ./media-sound/xineadump/xineadump-0.1-r2.ebuild
-2303061640 ./media-sound/xmms2/xmms2-0.9.2.ebuild
+2304201410 ./media-sound/xmms2/xmms2-0.9.2.ebuild
 2110200709 ./media-sound/xwax/xwax-1.8.ebuild
 2207191610 ./media-sound/yarock/yarock-1.4.0-r3.ebuild
 2303192210 ./media-sound/yoshimi/yoshimi-2.2.3.ebuild
@@ -19540,8 +19583,9 @@
 2108140239 ./media-video/mjpg-streamer/mjpg-streamer-0_pre20200524-r1.ebuild
 2006041239 ./media-video/mkclean/mkclean-0.8.10.ebuild
 2110221139 ./media-video/mkvalidator/mkvalidator-0.5.2.ebuild
-2210271540 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
 2212190040 ./media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
+2304190140 ./media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+2304190140 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
 2109080439 ./media-video/motion/motion-4.3.2-r1.ebuild
 2302091940 ./media-video/motion/motion-4.5.1.ebuild
 2205110210 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
@@ -19569,6 +19613,7 @@
 2304071440 ./media-video/pipewire/pipewire-9999.ebuild
 2304132240 ./media-video/pipewire/pipewire-0.3.67.ebuild
 2304181440 ./media-video/pipewire/pipewire-0.3.69-r1.ebuild
+2304201610 ./media-video/pipewire/pipewire-0.3.70.ebuild
 2301141613 ./media-video/pitivi/pitivi-2022.06.ebuild
 2304121910 ./media-video/pitivi/pitivi-2023.03.ebuild
 2210091540 ./media-video/projectx/projectx-0.91.0.10-r4.ebuild
@@ -19630,8 +19675,8 @@
 2101241539 ./media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild
 2006291709 ./media-video/vdrtools-genindex/vdrtools-genindex-0.1.3-r2.ebuild
 2301141613 ./media-video/vidcutter/vidcutter-6.0.5.1-r2.ebuild
-2302182310 ./media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild
 2302182310 ./media-video/vidcutter/vidcutter-9999.ebuild
+2304191510 ./media-video/vidcutter/vidcutter-6.0.5.1_p20230201.ebuild
 2111292209 ./media-video/videotrans/videotrans-1.6.1-r2.ebuild
 2301121440 ./media-video/vidify-audiosync/vidify-audiosync-0.3.0-r1.ebuild
 2302141940 ./media-video/vidify/vidify-2.2.6-r3.ebuild
@@ -19731,8 +19776,7 @@
 2303040910 ./net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
 2011271209 ./net-analyzer/firewalk/firewalk-5.0-r2.ebuild
 2203040040 ./net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild
-2106030210 ./net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
-2112100710 ./net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
+2304190940 ./net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
 2212161910 ./net-analyzer/fping/fping-5.1.ebuild
 2303101710 ./net-analyzer/fprobe/fprobe-1.1-r6.ebuild
 2212020710 ./net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -19757,7 +19801,6 @@
 2203202209 ./net-analyzer/hunt/hunt-1.5_p6_p1.ebuild
 2212161910 ./net-analyzer/hydra/hydra-9.4.ebuild
 2107160439 ./net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
-2301150210 ./net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
 2303182010 ./net-analyzer/icinga2/icinga2-2.13.7.ebuild
 2303182010 ./net-analyzer/icinga2/icinga2-9999.ebuild
 2212070040 ./net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild
@@ -19814,15 +19857,13 @@
 2202280210 ./net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild
 2112141939 ./net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild
 2208291610 ./net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild
-2301141613 ./net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
-2302252140 ./net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
+2304191540 ./net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
 2002230040 ./net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
 2208291610 ./net-analyzer/nagios-check_rbl/nagios-check_rbl-1.6.3.ebuild
 2209100340 ./net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild
 2208291610 ./net-analyzer/nagios-core/nagios-core-4.4.7.ebuild
 2303070540 ./net-analyzer/nagios-core/nagios-core-4.4.10.ebuild
-2301141613 ./net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
-2302252110 ./net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
+2304191540 ./net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
 1911032309 ./net-analyzer/nagios-plugin-check_lm_sensors/nagios-plugin-check_lm_sensors-4.1.1_p20191028.ebuild
 2207021910 ./net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild
 2201301639 ./net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-30.ebuild
@@ -19936,6 +19977,7 @@
 2301141613 ./net-analyzer/snallygaster/snallygaster-0.0.12.ebuild
 2303162210 ./net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild
 2212180740 ./net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild
+2304200810 ./net-analyzer/sngrep/sngrep-1.7.0.ebuild
 2210010340 ./net-analyzer/sniffit/sniffit-0.5-r1.ebuild
 2301141613 ./net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild
 2301141613 ./net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild
@@ -20041,10 +20083,6 @@
 2209280310 ./net-dialup/dial/dial-1.2-r2.ebuild
 2212182210 ./net-dialup/dwun/dwun-0.96e-r6.ebuild
 2301101410 ./net-dialup/freeradius-client/freeradius-client-1.1.7-r3.ebuild
-2301141613 ./net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
-2302011310 ./net-dialup/freeradius/freeradius-3.2.0.ebuild
-2302271140 ./net-dialup/freeradius/freeradius-3.0.26.ebuild
-2302271140 ./net-dialup/freeradius/freeradius-3.2.1.ebuild
 2304012010 ./net-dialup/freeradius/freeradius-3.2.2.ebuild
 2112142339 ./net-dialup/isdn-firmware/isdn-firmware-2011.8.29.8.37.ebuild
 2101021809 ./net-dialup/kpnadsl4linux/kpnadsl4linux-1.11.ebuild
@@ -20052,8 +20090,7 @@
 2303101710 ./net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
 2212020710 ./net-dialup/mgetty/mgetty-1.2.1-r4.ebuild
 2212241610 ./net-dialup/mingetty/mingetty-1.08-r3.ebuild
-2303022010 ./net-dialup/minicom/minicom-2.8-r1.ebuild
-2303191010 ./net-dialup/minicom/minicom-2.8-r2.ebuild
+2304191440 ./net-dialup/minicom/minicom-2.8-r2.ebuild
 2201240710 ./net-dialup/moserial/moserial-3.0.21.ebuild
 2011261339 ./net-dialup/mwavem/mwavem-2.0-r2.ebuild
 1911180139 ./net-dialup/neocon/neocon-20110228.ebuild
@@ -20101,8 +20138,8 @@
 2303241640 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild
 2301271140 ./net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
 2301271140 ./net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
-2301271140 ./net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
 2304022310 ./net-dns/dnsdist/dnsdist-1.8.0.ebuild
+2304190340 ./net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
 2208250640 ./net-dns/dnsmasq/dnsmasq-2.85.ebuild
 2208250640 ./net-dns/dnsmasq/dnsmasq-2.86-r1.ebuild
 2211291910 ./net-dns/dnsmasq/dnsmasq-2.87.ebuild
@@ -20215,6 +20252,7 @@
 2209291040 ./net-fs/minio/minio-2021.04.18.19.26.29-r2.ebuild
 2212030040 ./net-fs/netatalk/netatalk-3.1.12-r7.ebuild
 2211251310 ./net-fs/nfs-utils/nfs-utils-2.6.2-r1.ebuild
+2304200810 ./net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
 2209262210 ./net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild
 2212030040 ./net-fs/openafs/openafs-1.8.7.ebuild
 2212030040 ./net-fs/openafs/openafs-1.8.8.1-r1.ebuild
@@ -20243,7 +20281,7 @@
 2107120039 ./net-ftp/frox/frox-0.7.18-r8.ebuild
 2210060310 ./net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
 2202100210 ./net-ftp/ftpbase/ftpbase-0.01-r6.ebuild
-2207210340 ./net-ftp/gftp/gftp-2.9.1b.ebuild
+2304182140 ./net-ftp/gftp/gftp-2.9.1b.ebuild
 2211052310 ./net-ftp/lftp/lftp-9999.ebuild
 2302150110 ./net-ftp/lftp/lftp-4.9.2-r1.ebuild
 2204271010 ./net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild
@@ -20280,7 +20318,7 @@
 2207161810 ./net-im/ejabberd/ejabberd-22.05-r2.ebuild
 2302101610 ./net-im/ejabberd/ejabberd-23.01.ebuild
 2302110010 ./net-im/ejabberd/ejabberd-22.10.ebuild
-2302270540 ./net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
+2304200140 ./net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
 2303081710 ./net-im/err/err-6.1.9.ebuild
 2304170410 ./net-im/gajim/gajim-1.4.7-r2.ebuild
 2101151209 ./net-im/gitter-bin/gitter-bin-4.1.0-r1.ebuild
@@ -20425,7 +20463,7 @@
 2111080609 ./net-irc/sic/sic-1.2-r1.ebuild
 2301141613 ./net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
 2207030310 ./net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
-2212180940 ./net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
+2304191010 ./net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
 2302011910 ./net-irc/weechat/weechat-3.7.1.ebuild
 2303081940 ./net-irc/weechat/weechat-9999.ebuild
 2303282110 ./net-irc/weechat/weechat-3.8.ebuild
@@ -20496,7 +20534,7 @@
 2301141613 ./net-libs/gupnp/gupnp-1.4.3.ebuild
 2302171140 ./net-libs/gupnp/gupnp-1.6.3.ebuild
 2301132310 ./net-libs/http-parser/http-parser-2.9.4-r2.ebuild
-2209271840 ./net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
+2304181640 ./net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
 2208241510 ./net-libs/ignition-transport/ignition-transport-8.3.0.ebuild
 2212261340 ./net-libs/kdav2/kdav2-0.3.0.ebuild
 2212261340 ./net-libs/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-0.2_pre20200927.ebuild
@@ -20505,7 +20543,7 @@
 2301141613 ./net-libs/ldns/ldns-1.8.0-r4.ebuild
 2301141613 ./net-libs/ldns/ldns-1.8.1.ebuild
 2301271140 ./net-libs/ldns/ldns-1.8.3.ebuild
-2303012210 ./net-libs/ldns/ldns-1.8.3-r1.ebuild
+2304191440 ./net-libs/ldns/ldns-1.8.3-r1.ebuild
 2301141613 ./net-libs/libaccounts-glib/libaccounts-glib-1.26-r1.ebuild
 2206142240 ./net-libs/libad9361-iio/libad9361-iio-9999.ebuild
 2207130940 ./net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
@@ -20806,6 +20844,7 @@
 2104161439 ./net-mail/dot-forward/dot-forward-0.71-r4.ebuild
 2304071410 ./net-mail/dot-forward/dot-forward-0.71-r5.ebuild
 2303270512 ./net-mail/dovecot/dovecot-2.3.20-r1.ebuild
+2304201940 ./net-mail/dovecot/dovecot-2.3.20-r2.ebuild
 2211221010 ./net-mail/email/email-3.1.3-r2.ebuild
 2203040410 ./net-mail/eps/eps-1.7-r1.ebuild
 2210081540 ./net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r5.ebuild
@@ -20843,6 +20882,7 @@
 2102011639 ./net-mail/mswatch/mswatch-1.2.0-r1.ebuild
 2303041610 ./net-mail/mu/mu-1.8.14.ebuild
 2304101210 ./net-mail/mu/mu-1.10.2.ebuild
+2304192110 ./net-mail/mu/mu-1.10.3.ebuild
 2102191539 ./net-mail/muchsync/muchsync-6.ebuild
 2106190039 ./net-mail/nmzmail/nmzmail-1.1-r1.ebuild
 2303262010 ./net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -21000,7 +21040,7 @@
 2210010240 ./net-misc/drive/drive-0.4.0_p20210208.ebuild
 2303032040 ./net-misc/dropbear/dropbear-2022.83.ebuild
 2301141613 ./net-misc/dropbox-cli/dropbox-cli-2022.ebuild
-2302261640 ./net-misc/dropbox-cli/dropbox-cli-2023.ebuild
+2304191440 ./net-misc/dropbox-cli/dropbox-cli-2023.ebuild
 2304131740 ./net-misc/dropbox/dropbox-171.4.6182.ebuild
 2301141613 ./net-misc/econnman/econnman-1.1_p20160305.ebuild
 2203260309 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -21009,6 +21049,7 @@
 2301141613 ./net-misc/electron-cash/electron-cash-4.2.9.ebuild
 2301141613 ./net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild
 2304090940 ./net-misc/electrum/electrum-4.3.4-r1.ebuild
+2304190940 ./net-misc/electrum/electrum-4.4.0.ebuild
 2203050240 ./net-misc/ena-driver/ena-driver-2.6.1.ebuild
 2212131610 ./net-misc/ena-driver/ena-driver-2.8.0.ebuild
 2301281110 ./net-misc/ena-driver/ena-driver-2.8.2.ebuild
@@ -21074,7 +21115,7 @@
 2301061140 ./net-misc/hylafaxplus/hylafaxplus-7.0.6-r3.ebuild
 2203200310 ./net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
 2303071240 ./net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild
-2304151610 ./net-misc/icaclient/icaclient-23.3.0.32.ebuild
+2304201640 ./net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
 2107310340 ./net-misc/icecast/icecast-2.4.4-r1.ebuild
 2210070010 ./net-misc/ices/ices-2.0.2-r2.ebuild
 2009200239 ./net-misc/ifenslave/ifenslave-1.1.0-r6.ebuild
@@ -21266,9 +21307,10 @@
 2209220740 ./net-misc/rwbs/rwbs-0.27-r2.ebuild
 2212030040 ./net-misc/rwhoisd/rwhoisd-1.5.9.6-r2.ebuild
 2303302110 ./net-misc/rygel/rygel-0.42.1.ebuild
-2304030110 ./net-misc/rygel/rygel-0.42.2.ebuild
+2304191810 ./net-misc/rygel/rygel-0.42.2-r1.ebuild
+2304201540 ./net-misc/rygel/rygel-0.42.2-r2.ebuild
 2301101810 ./net-misc/s3cmd/s3cmd-2.2.0.ebuild
-2301101810 ./net-misc/s3cmd/s3cmd-2.3.0.ebuild
+2304200710 ./net-misc/s3cmd/s3cmd-2.3.0.ebuild
 2301101810 ./net-misc/s4cmd/s4cmd-2.1.0.ebuild
 2303192040 ./net-misc/s4cmd/s4cmd-2.1.0-r1.ebuild
 2206250910 ./net-misc/s6-networking/s6-networking-2.5.1.1.ebuild
@@ -21350,7 +21392,7 @@
 2212020710 ./net-misc/tiers/tiers-1.1.ebuild
 2301151210 ./net-misc/tigervnc/tigervnc-9999.ebuild
 2303302040 ./net-misc/tigervnc/tigervnc-1.13.0.ebuild
-2304142310 ./net-misc/tigervnc/tigervnc-1.13.1.ebuild
+2304191310 ./net-misc/tigervnc/tigervnc-1.13.1.ebuild
 2303022010 ./net-misc/tipcutils/tipcutils-2.0.3.ebuild
 2303022010 ./net-misc/tipcutils/tipcutils-3.0.6.ebuild
 1706022014 ./net-misc/ttytter/ttytter-2.1.00.ebuild
@@ -21425,7 +21467,7 @@
 2208160940 ./net-misc/rsync-bpc/rsync-bpc-3.1.3.0.ebuild
 2303182110 ./net-misc/gnome-connections/gnome-connections-44.0.ebuild
 2303302040 ./net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
-2304142310 ./net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+2304191310 ./net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
 2304022310 ./net-misc/kio-zeroconf/kio-zeroconf-22.12.3.ebuild
 2212211610 ./net-misc/bgpq4/bgpq4-1.7.ebuild
 2302281740 ./net-misc/bgpq4/bgpq4-1.8.ebuild
@@ -21460,7 +21502,6 @@
 2203040410 ./net-news/amphetadesk/amphetadesk-0.93.1-r1.ebuild
 2302271540 ./net-news/canto-curses/canto-curses-0.9.9.ebuild
 2302271540 ./net-news/canto-daemon/canto-daemon-0.9.8.ebuild
-2301141613 ./net-news/liferea/liferea-1.12.9-r2.ebuild
 2303171210 ./net-news/liferea/liferea-1.12.10.ebuild
 2304140440 ./net-news/liferea/liferea-1.14.5.ebuild
 2212020710 ./net-news/newsboat/newsboat-2.21-r1.ebuild
@@ -21738,8 +21779,8 @@
 2301141613 ./net-vpn/riseup-vpn/riseup-vpn-0.21.11.ebuild
 2302061310 ./net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild
 2212042140 ./net-vpn/strongswan/strongswan-5.9.8.ebuild
-2303150240 ./net-vpn/strongswan/strongswan-5.9.10.ebuild
 2303302040 ./net-vpn/strongswan/strongswan-5.9.9.ebuild
+2304190840 ./net-vpn/strongswan/strongswan-5.9.10.ebuild
 2302250340 ./net-vpn/tailscale/tailscale-1.36.2.ebuild
 2304131840 ./net-vpn/tailscale/tailscale-1.38.4.ebuild
 2207030410 ./net-vpn/tinc/tinc-1.0.36.ebuild
@@ -21774,7 +21815,6 @@
 2301141613 ./net-wireless/blueman/blueman-2.3.5.ebuild
 2301141613 ./net-wireless/blueman/blueman-9999.ebuild
 2201032209 ./net-wireless/bluez-tools/bluez-tools-0_p20201025.ebuild
-2301142340 ./net-wireless/bluez/bluez-5.65-r1.ebuild
 2301310910 ./net-wireless/bluez/bluez-5.66-r1.ebuild
 2104271709 ./net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 2105050139 ./net-wireless/bss/bss-0.8-r2.ebuild
@@ -21825,8 +21865,8 @@
 2303312040 ./net-wireless/iwd/iwd-2.3.ebuild
 2301041840 ./net-wireless/iwgtk/iwgtk-0.9.ebuild
 2301042340 ./net-wireless/kismet/kismet-2022.08.1-r1.ebuild
-2302230010 ./net-wireless/kismet/kismet-2022.08.1-r2.ebuild
 2302230010 ./net-wireless/kismet/kismet-9999.ebuild
+2304191440 ./net-wireless/kismet/kismet-2022.08.1-r2.ebuild
 2008032109 ./net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild
 2008032109 ./net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
 2301141613 ./net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
@@ -21842,8 +21882,8 @@
 2203121439 ./net-wireless/limesuite/limesuite-20.10.0.ebuild
 2202091640 ./net-wireless/linssid/linssid-3.6-r2.ebuild
 2301141613 ./net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
-2303192040 ./net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
 2303192040 ./net-wireless/lorcon/lorcon-9999.ebuild
+2304191340 ./net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
 2110212139 ./net-wireless/madwimax/madwimax-0.1.1-r2.ebuild
 2111200009 ./net-wireless/mdk/mdk-3.6-r1.ebuild
 2007020109 ./net-wireless/mfoc/mfoc-0.10.7-r1.ebuild
@@ -22140,6 +22180,8 @@
 2210082110 ./sci-chemistry/cara-bin/cara-bin-1.8.4-r2.ebuild
 2302261910 ./sci-chemistry/chemex/chemex-2022.3.0.ebuild
 2304171810 ./sci-chemistry/chemex/chemex-2022.3.1.ebuild
+2304191610 ./sci-chemistry/chemex/chemex-2022.3.3.ebuild
+2304201640 ./sci-chemistry/chemex/chemex-2022.3.4.ebuild
 2004051239 ./sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
 2304180040 ./sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.95_pre20171122.ebuild
 2008291539 ./sci-chemistry/chemtool/chemtool-1.6.14.ebuild
@@ -22147,7 +22189,6 @@
 2110211309 ./sci-chemistry/cluster/cluster-1.3.081231-r1.ebuild
 2209041540 ./sci-chemistry/dssp/dssp-2.2.1-r3.ebuild
 2209041540 ./sci-chemistry/dssp/dssp-3.0.11.ebuild
-2212052340 ./sci-chemistry/dssp/dssp-4.2.0.ebuild
 2302261910 ./sci-chemistry/dssp/dssp-4.2.2.1.ebuild
 2108141339 ./sci-chemistry/easychem/easychem-0.6-r1.ebuild
 2011272109 ./sci-chemistry/elem/elem-1.0.3-r2.ebuild
@@ -22242,20 +22283,32 @@
 2302090310 ./sci-electronics/kicad-footprints/kicad-footprints-6.0.9.ebuild
 2302170840 ./sci-electronics/kicad-footprints/kicad-footprints-7.0.0.ebuild
 2302170840 ./sci-electronics/kicad-footprints/kicad-footprints-9999.ebuild
+2304192110 ./sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad-footprints/kicad-footprints-7.0.1.ebuild
 2302090310 ./sci-electronics/kicad-meta/kicad-meta-6.0.9.ebuild
 2302170840 ./sci-electronics/kicad-meta/kicad-meta-7.0.0.ebuild
+2304192110 ./sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad-meta/kicad-meta-7.0.1.ebuild
 2302090310 ./sci-electronics/kicad-packages3d/kicad-packages3d-6.0.9.ebuild
 2302170840 ./sci-electronics/kicad-packages3d/kicad-packages3d-7.0.0.ebuild
 2302170840 ./sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
+2304192110 ./sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad-packages3d/kicad-packages3d-7.0.1.ebuild
 2302090310 ./sci-electronics/kicad-symbols/kicad-symbols-6.0.9.ebuild
 2302170840 ./sci-electronics/kicad-symbols/kicad-symbols-7.0.0.ebuild
 2302170840 ./sci-electronics/kicad-symbols/kicad-symbols-9999.ebuild
+2304192110 ./sci-electronics/kicad-symbols/kicad-symbols-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad-symbols/kicad-symbols-7.0.1.ebuild
 2302090310 ./sci-electronics/kicad-templates/kicad-templates-6.0.9.ebuild
 2302170840 ./sci-electronics/kicad-templates/kicad-templates-7.0.0.ebuild
 2302170840 ./sci-electronics/kicad-templates/kicad-templates-9999.ebuild
-2302090310 ./sci-electronics/kicad/kicad-6.0.9.ebuild
+2304192110 ./sci-electronics/kicad-templates/kicad-templates-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad-templates/kicad-templates-7.0.1.ebuild
 2302212110 ./sci-electronics/kicad/kicad-7.0.0-r1.ebuild
-2302212110 ./sci-electronics/kicad/kicad-9999.ebuild
+2304192110 ./sci-electronics/kicad/kicad-6.0.11.ebuild
+2304192110 ./sci-electronics/kicad/kicad-6.0.9-r1.ebuild
+2304192110 ./sci-electronics/kicad/kicad-7.0.1.ebuild
+2304192110 ./sci-electronics/kicad/kicad-9999.ebuild
 2303291540 ./sci-electronics/klayout/klayout-0.28.5.ebuild
 2303290140 ./sci-electronics/klayout/klayout-9999.ebuild
 2303291340 ./sci-electronics/ktechlab/ktechlab-0.51.0.ebuild
@@ -22315,8 +22368,8 @@
 2202241639 ./sci-geosciences/gpscorrelate/gpscorrelate-2.0.ebuild
 2301141613 ./sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild
 2301141613 ./sci-geosciences/gpsd/gpsd-3.24.ebuild
-2301150511 ./sci-geosciences/gpsd/gpsd-3.25.ebuild
 2301150511 ./sci-geosciences/gpsd/gpsd-9999.ebuild
+2304191340 ./sci-geosciences/gpsd/gpsd-3.25.ebuild
 2203260340 ./sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
 2103201539 ./sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
 2204061609 ./sci-geosciences/gpxlab/gpxlab-0.7.0.ebuild
@@ -22398,7 +22451,7 @@
 2302071410 ./sci-geosciences/qmapshack/qmapshack-1.16.1-r1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.1.0a.ebuild
 2301141613 ./sci-geosciences/routino/routino-3.3.3-r2.ebuild
-2302211410 ./sci-geosciences/routino/routino-3.3.3-r4.ebuild
+2304191510 ./sci-geosciences/routino/routino-3.3.3-r4.ebuild
 2212261910 ./sci-geosciences/tcd-utils/tcd-utils-20120115-r2.ebuild
 2203260340 ./sci-geosciences/viking/viking-1.10.ebuild
 2209221110 ./sci-geosciences/xtide/xtide-2.15.5.ebuild
@@ -22449,7 +22502,7 @@
 2207031210 ./sci-libs/cfitsio/cfitsio-4.1.0.ebuild
 2301291940 ./sci-libs/cfitsio/cfitsio-4.2.0.ebuild
 2110211309 ./sci-libs/cgcode/cgcode-1.0-r2.ebuild
-2303041710 ./sci-libs/cgnslib/cgnslib-4.3.0.ebuild
+2304181910 ./sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild
 2107161509 ./sci-libs/cholmod/cholmod-3.0.13.ebuild
 2212010640 ./sci-libs/cholmod/cholmod-3.0.14.ebuild
 2111190309 ./sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -22546,7 +22599,7 @@
 2212261940 ./sci-libs/idlmarkwardt/idlmarkwardt-20160319-r1.ebuild
 2303291940 ./sci-libs/ignition-common/ignition-common-3.14.2.ebuild
 2108121640 ./sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.4.0.ebuild
-2203091710 ./sci-libs/ignition-math/ignition-math-6.10.0.ebuild
+2304181640 ./sci-libs/ignition-math/ignition-math-6.14.0.ebuild
 2004131339 ./sci-libs/iml/iml-1.0.5.ebuild
 2201121340 ./sci-libs/inchi/inchi-1.04-r1.ebuild
 2301132210 ./sci-libs/inchi/inchi-1.06-r1.ebuild
@@ -22575,7 +22628,6 @@
 2212022210 ./sci-libs/libcerf/libcerf-1.17.ebuild
 2209041610 ./sci-libs/libcifpp/libcifpp-2.0.4-r1.ebuild
 2209041610 ./sci-libs/libcifpp/libcifpp-3.0.0.ebuild
-2212041810 ./sci-libs/libcifpp/libcifpp-5.0.5.ebuild
 2302261910 ./sci-libs/libcifpp/libcifpp-5.0.8.ebuild
 2208302210 ./sci-libs/libdap/libdap-3.20.9.ebuild
 2105280039 ./sci-libs/libecpint/libecpint-1.0.6.ebuild
@@ -22628,7 +22680,7 @@
 2211191510 ./sci-libs/mathgl/mathgl-2.4.4-r1.ebuild
 2205092040 ./sci-libs/matio/matio-1.5.23.ebuild
 2103132239 ./sci-libs/mc/mc-1.5.ebuild
-2301141613 ./sci-libs/med/med-4.1.1.ebuild
+2304181910 ./sci-libs/med/med-4.1.1-r1.ebuild
 2212010640 ./sci-libs/metis/metis-5.1.0-r5.ebuild
 1703191202 ./sci-libs/minuit/minuit-5.34.14.ebuild
 2211191510 ./sci-libs/miopen/miopen-5.1.3-r1.ebuild
@@ -22819,7 +22871,7 @@
 2301131340 ./sci-mathematics/gimps/gimps-30.8.15.ebuild
 2301131340 ./sci-mathematics/gimps/gimps-30.8.17.ebuild
 2301141613 ./sci-mathematics/ginac/ginac-1.8.2.ebuild
-2302171310 ./sci-mathematics/ginac/ginac-1.8.6.ebuild
+2304191510 ./sci-mathematics/ginac/ginac-1.8.6.ebuild
 2212041241 ./sci-mathematics/glpk/glpk-5.0-r1.ebuild
 2209162110 ./sci-mathematics/gmm/gmm-5.4.ebuild
 2212162210 ./sci-mathematics/gmm/gmm-5.4.2.ebuild
@@ -22846,7 +22898,7 @@
 2005211239 ./sci-mathematics/mathmod/mathmod-4.1-r1.ebuild
 2207072340 ./sci-mathematics/mathomatic/mathomatic-16.0.5-r1.ebuild
 2301220940 ./sci-mathematics/maxima/maxima-5.46.0.ebuild
-2302161640 ./sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
+2304191510 ./sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
 2302062040 ./sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
 2201290310 ./sci-mathematics/msieve/msieve-1.53-r1.ebuild
 2210280310 ./sci-mathematics/nauty/nauty-2.7.4.ebuild
@@ -22894,11 +22946,9 @@
 2302140840 ./sci-mathematics/yacas/yacas-1.9.1.ebuild
 2201231739 ./sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
 2304082110 ./sci-mathematics/z3/z3-4.12.1.ebuild
-2208260340 ./sci-mathematics/lean/lean-3.9999.ebuild
 2212220310 ./sci-mathematics/lean/lean-3.49.0.ebuild
-2212220310 ./sci-mathematics/lean/lean-3.50.1.ebuild
-2212240610 ./sci-mathematics/lean/lean-3.50.2.ebuild
-2212270540 ./sci-mathematics/lean/lean-3.50.3.ebuild
+2304181710 ./sci-mathematics/lean/lean-3.50.3.ebuild
+2304181710 ./sci-mathematics/lean/lean-3.9999.ebuild
 2302241210 ./sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild
 2111261640 ./sci-mathematics/metamath/metamath-0.198.ebuild
 2302022110 ./sci-mathematics/easycrypt/easycrypt-2022.04_p20220505.ebuild
@@ -22911,14 +22961,12 @@
 2302072240 ./sci-mathematics/primecount/primecount-7.6.ebuild
 2302072240 ./sci-mathematics/primesieve/primesieve-11.0.ebuild
 2203110039 ./sci-mathematics/verit/verit-2021.06.2.ebuild
-2301120440 ./sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
-2301141613 ./sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
+2304181710 ./sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
 2302220310 ./sci-mathematics/stp/stp-2.3.3-r3.ebuild
 2112282109 ./sci-mathematics/cadical/cadical-1.5.2-r1.ebuild
 2301110710 ./sci-mathematics/cadical/cadical-1.5.3-r1.ebuild
 2303041940 ./sci-mathematics/smtinterpol/smtinterpol-2.5_p20211018.ebuild
 2301280340 ./sci-mathematics/cadabra/cadabra-2.4.3.2.ebuild
-2303090010 ./sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
 2303090010 ./sci-mathematics/cadabra/cadabra-2.4.2.2-r1.ebuild
 2303041940 ./sci-mathematics/metamath-databases/metamath-databases-20220303.ebuild
 2303020840 ./sci-mathematics/alectryon/alectryon-1.4.0-r1.ebuild
@@ -23050,8 +23098,8 @@
 2303071510 ./sci-visualization/gwyddion/gwyddion-2.61.ebuild
 2302192010 ./sci-visualization/jupyter-dash/jupyter-dash-0.4.2.ebuild
 2109071609 ./sci-visualization/kst/kst-2.0.8-r2.ebuild
-2301301840 ./sci-visualization/labplot/labplot-2.9.0-r1.ebuild
 2301301840 ./sci-visualization/labplot/labplot-9999.ebuild
+2304182140 ./sci-visualization/labplot/labplot-2.9.0-r1.ebuild
 2301141613 ./sci-visualization/paraview/paraview-5.10.1-r4.ebuild
 2301141613 ./sci-visualization/paraview/paraview-5.11.0_rc2-r1.ebuild
 2302242140 ./sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
@@ -23900,17 +23948,15 @@
 2102111109 ./sys-apps/conspy/conspy-1.16.ebuild
 2301141613 ./sys-apps/coreutils/coreutils-8.32-r1.ebuild
 2302031640 ./sys-apps/coreutils/coreutils-9.1-r2.ebuild
-2303150512 ./sys-apps/coreutils/coreutils-9999.ebuild
-2303210110 ./sys-apps/coreutils/coreutils-9.2.ebuild
-2303240210 ./sys-apps/coreutils/coreutils-9.2-r1.ebuild
 2304022310 ./sys-apps/coreutils/coreutils-9.2-r2.ebuild
-2304110110 ./sys-apps/coreutils/coreutils-9.2_p20230410.ebuild
+2304182010 ./sys-apps/coreutils/coreutils-9.3.ebuild
+2304182010 ./sys-apps/coreutils/coreutils-9999.ebuild
 2104060140 ./sys-apps/cpint/cpint-2.5.3.ebuild
 2303040310 ./sys-apps/cpuid/cpuid-20230120.ebuild
 2304092240 ./sys-apps/cpuid/cpuid-20230406.ebuild
 2211180640 ./sys-apps/cracklib-words/cracklib-words-2.9.8.ebuild
-2303170110 ./sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild
 2304030110 ./sys-apps/cracklib-words/cracklib-words-2.9.11.ebuild
+2304191440 ./sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild
 2202271839 ./sys-apps/crazydiskinfo/crazydiskinfo-1.1.0-r1.ebuild
 2304110140 ./sys-apps/daemonize/daemonize-1.7.8.ebuild
 2201290710 ./sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -23982,15 +24028,15 @@
 2303022340 ./sys-apps/file/file-9999.ebuild
 2302242210 ./sys-apps/findutils/findutils-4.9.0-r2.ebuild
 2301141613 ./sys-apps/firejail/firejail-0.9.70.ebuild
-2301190110 ./sys-apps/firejail/firejail-0.9.72.ebuild
+2304191310 ./sys-apps/firejail/firejail-0.9.72.ebuild
 2107310840 ./sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
 2303041210 ./sys-apps/fix-gnustack/fix-gnustack-0.1-r1.ebuild
 2210030040 ./sys-apps/flashrom/flashrom-1.2-r4.ebuild
 2303081740 ./sys-apps/flashrom/flashrom-1.3.0.ebuild
 2301141613 ./sys-apps/flatpak/flatpak-1.12.3-r1.ebuild
 2303032110 ./sys-apps/flatpak/flatpak-1.14.1.ebuild
-2303170340 ./sys-apps/flatpak/flatpak-1.12.8.ebuild
-2304060610 ./sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
+2304200810 ./sys-apps/flatpak/flatpak-1.12.8.ebuild
+2304200810 ./sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
 2205132340 ./sys-apps/fwts/fwts-22.03.00.ebuild
 2303301310 ./sys-apps/fwupd-efi/fwupd-efi-1.4.ebuild
 2302202340 ./sys-apps/fwupd/fwupd-1.8.10.ebuild
@@ -24163,7 +24209,7 @@
 2304032040 ./sys-apps/opal-utils/opal-utils-7.0.ebuild
 2304040040 ./sys-apps/openrc/openrc-0.46.ebuild
 2304040040 ./sys-apps/openrc/openrc-9999.ebuild
-2304180910 ./sys-apps/openrc/openrc-0.47.ebuild
+2304202010 ./sys-apps/openrc/openrc-0.47.1.ebuild
 2211210110 ./sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild
 2301141613 ./sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0-r1.ebuild
 2212171010 ./sys-apps/osinfo-db/osinfo-db-20221130.ebuild
@@ -24253,6 +24299,7 @@
 2303041510 ./sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
 2302170540 ./sys-apps/shadow/shadow-4.12.3-r1.ebuild
 2302170540 ./sys-apps/shadow/shadow-4.13-r2.ebuild
+2304191010 ./sys-apps/shadow/shadow-4.13-r3.ebuild
 2205051310 ./sys-apps/smartmontools/smartmontools-7.3.ebuild
 2205051310 ./sys-apps/smartmontools/smartmontools-9999.ebuild
 2303122210 ./sys-apps/smc-sum/smc-sum-2.10.0.20221209.ebuild
@@ -24315,6 +24362,7 @@
 2303311510 ./sys-apps/util-linux/util-linux-2.38.1.ebuild
 2304050440 ./sys-apps/util-linux/util-linux-2.39_rc2.ebuild
 2304070511 ./sys-apps/util-linux/util-linux-2.38.1-r2.ebuild
+2304201910 ./sys-apps/util-linux/util-linux-2.39_rc3.ebuild
 2210280140 ./sys-apps/vbetool/vbetool-1.2.2.ebuild
 2204071839 ./sys-apps/watchdog/watchdog-5.16.ebuild
 2303041440 ./sys-apps/watchdog/watchdog-5.16-r1.ebuild
@@ -24368,8 +24416,7 @@
 2303062110 ./sys-apps/config-site/config-site-0.ebuild
 2304152040 ./sys-apps/system-monitoring-center/system-monitoring-center-2.10.0.ebuild
 2202121739 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
-2303040310 ./sys-auth/AusweisApp2/AusweisApp2-1.26.2.ebuild
-2303122210 ./sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild
+2304190010 ./sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild
 2210232040 ./sys-auth/docker_auth/docker_auth-1.9.0.ebuild
 2211100840 ./sys-auth/elogind/elogind-246.10-r1.ebuild
 2212060940 ./sys-auth/elogind/elogind-246.10-r2.ebuild
@@ -24435,8 +24482,7 @@
 2208190840 ./sys-auth/seatd/seatd-0.7.0.ebuild
 2209152010 ./sys-auth/seatd/seatd-9999.ebuild
 2211131510 ./sys-auth/seatd/seatd-0.7.0-r1.ebuild
-2210201410 ./sys-auth/skey/skey-1.1.5-r13.ebuild
-2303170040 ./sys-auth/skey/skey-1.1.5-r14.ebuild
+2304190910 ./sys-auth/skey/skey-1.1.5-r14.ebuild
 2303071240 ./sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.4.0.ebuild
 2301141613 ./sys-auth/sssd/sssd-2.5.2-r3.ebuild
 2301141613 ./sys-auth/sssd/sssd-2.6.0-r2.ebuild
@@ -24448,7 +24494,7 @@
 2301141613 ./sys-auth/solo1/solo1-0.1.1.ebuild
 2303162210 ./sys-auth/solo1/solo1-0.1.1-r1.ebuild
 2301141613 ./sys-auth/ssh-import-id/ssh-import-id-5.11.ebuild
-2302280140 ./sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
+2304191410 ./sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
 2204080009 ./sys-block/aoetools/aoetools-37.ebuild
 2202100210 ./sys-block/arcconf/arcconf-2.01.22270-r2.ebuild
 2303250340 ./sys-block/arcconf/arcconf-4.09.00.25611.ebuild
@@ -24811,22 +24857,25 @@
 2303212340 ./sys-devel/clang-common/clang-common-17.0.0.9999.ebuild
 2303251440 ./sys-devel/clang-common/clang-common-17.0.0_pre20230325.ebuild
 2304052140 ./sys-devel/clang-common/clang-common-16.0.1.ebuild
-2304050940 ./sys-devel/clang-common/clang-common-16.0.2.9999.ebuild
 2304142240 ./sys-devel/clang-common/clang-common-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/clang-common/clang-common-16.0.2.ebuild
+2304191910 ./sys-devel/clang-common/clang-common-16.0.3.9999.ebuild
 2208022310 ./sys-devel/clang-runtime/clang-runtime-14.0.6.ebuild
 2301251140 ./sys-devel/clang-runtime/clang-runtime-17.0.0.9999.ebuild
 2301270140 ./sys-devel/clang-runtime/clang-runtime-15.0.7.ebuild
 2303251440 ./sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230325.ebuild
 2304052140 ./sys-devel/clang-runtime/clang-runtime-16.0.1.ebuild
-2304050940 ./sys-devel/clang-runtime/clang-runtime-16.0.2.9999.ebuild
 2304142240 ./sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/clang-runtime/clang-runtime-16.0.2.ebuild
+2304191910 ./sys-devel/clang-runtime/clang-runtime-16.0.3.9999.ebuild
 2302231840 ./sys-devel/clang/clang-14.0.6-r1.ebuild
 2303251440 ./sys-devel/clang/clang-17.0.0_pre20230325.ebuild
 2304011640 ./sys-devel/clang/clang-17.0.0.9999.ebuild
 2304052140 ./sys-devel/clang/clang-16.0.1.ebuild
-2304050940 ./sys-devel/clang/clang-16.0.2.9999.ebuild
 2304112140 ./sys-devel/clang/clang-15.0.7-r1.ebuild
 2304142240 ./sys-devel/clang/clang-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/clang/clang-16.0.2.ebuild
+2304192310 ./sys-devel/clang/clang-16.0.3.9999.ebuild
 2204141010 ./sys-devel/cons/cons-2.3.0-r1.ebuild
 2303062110 ./sys-devel/crossdev/crossdev-20230209-r1.ebuild
 2303062110 ./sys-devel/crossdev/crossdev-99999999.ebuild
@@ -24862,6 +24911,8 @@
 2304171510 ./sys-devel/gcc/gcc-13.0.1.9999.ebuild
 2304170240 ./sys-devel/gcc/gcc-13.0.1_pre20230416.ebuild
 2304171510 ./sys-devel/gcc/gcc-14.0.0.9999.ebuild
+2304200740 ./sys-devel/gcc/gcc-10.4.1_p20230419.ebuild
+2304191740 ./sys-devel/gcc/gcc-13.0.1_pre20230419-r1.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2301260940 ./sys-devel/gdb/gdb-12.1-r4.ebuild
 2301282240 ./sys-devel/gdb/gdb-12.1-r3.ebuild
@@ -24882,23 +24933,26 @@
 2301291810 ./sys-devel/lld/lld-15.0.7.ebuild
 2303251440 ./sys-devel/lld/lld-17.0.0_pre20230325.ebuild
 2304052140 ./sys-devel/lld/lld-16.0.1.ebuild
-2304050940 ./sys-devel/lld/lld-16.0.2.9999.ebuild
 2304172210 ./sys-devel/lld/lld-17.0.0.9999.ebuild
 2304172210 ./sys-devel/lld/lld-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/lld/lld-16.0.2.ebuild
+2304191910 ./sys-devel/lld/lld-16.0.3.9999.ebuild
 2208022310 ./sys-devel/llvm-common/llvm-common-14.0.6.ebuild
 2301251140 ./sys-devel/llvm-common/llvm-common-17.0.0.9999.ebuild
 2301270140 ./sys-devel/llvm-common/llvm-common-15.0.7.ebuild
 2303251440 ./sys-devel/llvm-common/llvm-common-17.0.0_pre20230325.ebuild
 2304052140 ./sys-devel/llvm-common/llvm-common-16.0.1.ebuild
-2304050940 ./sys-devel/llvm-common/llvm-common-16.0.2.9999.ebuild
 2304142240 ./sys-devel/llvm-common/llvm-common-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/llvm-common/llvm-common-16.0.2.ebuild
+2304191910 ./sys-devel/llvm-common/llvm-common-16.0.3.9999.ebuild
 2303110840 ./sys-devel/llvm/llvm-14.0.6-r2.ebuild
 2303110840 ./sys-devel/llvm/llvm-15.0.7.ebuild
 2303251440 ./sys-devel/llvm/llvm-17.0.0_pre20230325.ebuild
 2304011640 ./sys-devel/llvm/llvm-17.0.0.9999.ebuild
 2304052140 ./sys-devel/llvm/llvm-16.0.1.ebuild
-2304050940 ./sys-devel/llvm/llvm-16.0.2.9999.ebuild
 2304142240 ./sys-devel/llvm/llvm-17.0.0_pre20230414.ebuild
+2304192310 ./sys-devel/llvm/llvm-16.0.2.ebuild
+2304191910 ./sys-devel/llvm/llvm-16.0.3.9999.ebuild
 2208022310 ./sys-devel/llvmgold/llvmgold-14.ebuild
 2211051440 ./sys-devel/llvmgold/llvmgold-15.ebuild
 2301251140 ./sys-devel/llvmgold/llvmgold-17.ebuild
@@ -24910,7 +24964,7 @@
 2303240511 ./sys-devel/make/make-9999.ebuild
 2301231040 ./sys-devel/mold/mold-9999.ebuild
 2303041440 ./sys-devel/mold/mold-1.10.1.ebuild
-2303170310 ./sys-devel/mold/mold-1.11.0.ebuild
+2304190940 ./sys-devel/mold/mold-1.11.0.ebuild
 2001292109 ./sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
 2101061839 ./sys-devel/native-cctools/native-cctools-4.ebuild
 2101061839 ./sys-devel/native-cctools/native-cctools-5.ebuild
@@ -25151,6 +25205,7 @@
 2304032210 ./sys-fs/mdadm/mdadm-4.2-r1.ebuild
 2303061610 ./sys-fs/mergerfs/mergerfs-2.34.1.ebuild
 2303300010 ./sys-fs/mergerfs/mergerfs-2.35.0.ebuild
+2304190040 ./sys-fs/mergerfs/mergerfs-2.35.1.ebuild
 2104192239 ./sys-fs/mhddfs/mhddfs-0.1.39-r2.ebuild
 2304110140 ./sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild
 2301090513 ./sys-fs/mtd-utils/mtd-utils-2.1.5.ebuild
@@ -25184,7 +25239,7 @@
 2303180910 ./sys-fs/squashfs-tools/squashfs-tools-4.6.ebuild
 2303260610 ./sys-fs/squashfs-tools/squashfs-tools-4.6.1.ebuild
 2210081340 ./sys-fs/squashfuse/squashfuse-0.1.103.ebuild
-2210090140 ./sys-fs/squashfuse/squashfuse-0.1.105.ebuild
+2304190440 ./sys-fs/squashfuse/squashfuse-0.1.105.ebuild
 2208272010 ./sys-fs/static-dev/static-dev-0.1-r2.ebuild
 2210300110 ./sys-fs/sysfsutils/sysfsutils-2.1.1.ebuild
 2110060640 ./sys-fs/treesize/treesize-0.54.1-r1.ebuild
@@ -25218,10 +25273,12 @@
 2302240310 ./sys-fs/zfs-kmod/zfs-kmod-2.1.9.ebuild
 2304150340 ./sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
 2304160710 ./sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
+2304201940 ./sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
 2301141613 ./sys-fs/zfs/zfs-2.1.7-r1.ebuild
 2301272340 ./sys-fs/zfs/zfs-9999.ebuild
 2304032040 ./sys-fs/zfs/zfs-2.1.9.ebuild
 2304150310 ./sys-fs/zfs/zfs-2.1.10.ebuild
+2304201940 ./sys-fs/zfs/zfs-2.1.11.ebuild
 2203200310 ./sys-fs/fswatch/fswatch-1.16.0.ebuild
 2301262310 ./sys-fs/fswatch/fswatch-1.17.1.ebuild
 2302270040 ./sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r4.ebuild
@@ -25308,6 +25365,13 @@
 2304132010 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.107.ebuild
 2304132010 ./sys-kernel/gentoo-sources/gentoo-sources-6.1.24.ebuild
 2304132010 ./sys-kernel/gentoo-sources/gentoo-sources-6.2.11.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.313.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.281.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.178.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.108.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.241.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-6.1.25.ebuild
+2304201640 ./sys-kernel/gentoo-sources/gentoo-sources-6.2.12.ebuild
 2303060310 ./sys-kernel/git-sources/git-sources-6.3_rc1.ebuild
 2303130540 ./sys-kernel/git-sources/git-sources-6.3_rc2.ebuild
 2303200240 ./sys-kernel/git-sources/git-sources-6.3_rc3.ebuild
@@ -25376,11 +25440,11 @@
 2212061110 ./sys-kernel/rt-sources/rt-sources-6.0.5_p14.ebuild
 2212161840 ./sys-kernel/rt-sources/rt-sources-4.9.327_p197.ebuild
 2302150610 ./sys-kernel/rt-sources/rt-sources-5.4.230_p80.ebuild
-2303010540 ./sys-kernel/rt-sources/rt-sources-5.15.96_p61.ebuild
 2303171540 ./sys-kernel/rt-sources/rt-sources-4.19.277_p122.ebuild
 2303171540 ./sys-kernel/rt-sources/rt-sources-6.1.19_p8.ebuild
 2303250110 ./sys-kernel/rt-sources/rt-sources-4.14.311_p146.ebuild
 2303250210 ./sys-kernel/rt-sources/rt-sources-5.10.176_p86.ebuild
+2304201440 ./sys-kernel/rt-sources/rt-sources-5.15.107_p62.ebuild
 2301290610 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
 2301290610 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.19.9999.ebuild
 2301290610 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.9999.ebuild
@@ -25396,13 +25460,13 @@
 2304140540 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.107.ebuild
 2304140540 ./sys-kernel/vanilla-kernel/vanilla-kernel-6.1.24.ebuild
 2304140540 ./sys-kernel/vanilla-kernel/vanilla-kernel-6.2.11.ebuild
-2304051340 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.312.ebuild
-2304051340 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.280.ebuild
-2304051340 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.177.ebuild
-2304051340 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.240.ebuild
-2304131940 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.107.ebuild
-2304131940 ./sys-kernel/vanilla-sources/vanilla-sources-6.1.24.ebuild
-2304131940 ./sys-kernel/vanilla-sources/vanilla-sources-6.2.11.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.313.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.281.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.178.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.108.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.241.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-6.1.25.ebuild
+2304201440 ./sys-kernel/vanilla-sources/vanilla-sources-6.2.12.ebuild
 2304152110 ./sys-kernel/zen-sources/zen-sources-6.2.11.ebuild
 2212021340 ./sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
 2201062240 ./sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -25423,18 +25487,20 @@
 2302110410 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.7.ebuild
 2303251440 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.1.ebuild
-2304050940 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.9999.ebuild
 2304142240 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.ebuild
+2304191910 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.3.9999.ebuild
 2303190710 ./sys-libs/compiler-rt/compiler-rt-14.0.6-r1.ebuild
 2303190710 ./sys-libs/compiler-rt/compiler-rt-15.0.7.ebuild
 2303190710 ./sys-libs/compiler-rt/compiler-rt-17.0.0.9999.ebuild
 2303251440 ./sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/compiler-rt/compiler-rt-16.0.1.ebuild
-2304050940 ./sys-libs/compiler-rt/compiler-rt-16.0.2.9999.ebuild
 2304142240 ./sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/compiler-rt/compiler-rt-16.0.2.ebuild
+2304191910 ./sys-libs/compiler-rt/compiler-rt-16.0.3.9999.ebuild
 2301141613 ./sys-libs/cracklib/cracklib-2.9.8.ebuild
-2303170540 ./sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
 2304030110 ./sys-libs/cracklib/cracklib-2.9.11.ebuild
+2304191440 ./sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
 2112131739 ./sys-libs/csu/csu-85-r1.ebuild
 2111271610 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4-r1.ebuild
 2204290540 ./sys-libs/db/db-6.0.35-r4.ebuild
@@ -25489,15 +25555,17 @@
 2303190710 ./sys-libs/libcxx/libcxx-17.0.0.9999.ebuild
 2303251440 ./sys-libs/libcxx/libcxx-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/libcxx/libcxx-16.0.1.ebuild
-2304050940 ./sys-libs/libcxx/libcxx-16.0.2.9999.ebuild
 2304142240 ./sys-libs/libcxx/libcxx-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/libcxx/libcxx-16.0.2.ebuild
+2304191910 ./sys-libs/libcxx/libcxx-16.0.3.9999.ebuild
 2303190710 ./sys-libs/libcxxabi/libcxxabi-14.0.6.ebuild
 2303190710 ./sys-libs/libcxxabi/libcxxabi-15.0.7.ebuild
 2303190710 ./sys-libs/libcxxabi/libcxxabi-17.0.0.9999.ebuild
 2303251440 ./sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/libcxxabi/libcxxabi-16.0.1.ebuild
-2304050940 ./sys-libs/libcxxabi/libcxxabi-16.0.2.9999.ebuild
 2304142240 ./sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/libcxxabi/libcxxabi-16.0.2.ebuild
+2304191910 ./sys-libs/libcxxabi/libcxxabi-16.0.3.9999.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
 2205191240 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2303041140 ./sys-libs/libfaketime/libfaketime-0.9.10.ebuild
@@ -25511,8 +25579,9 @@
 2303211810 ./sys-libs/libomp/libomp-17.0.0.9999.ebuild
 2303251440 ./sys-libs/libomp/libomp-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/libomp/libomp-16.0.1.ebuild
-2304050940 ./sys-libs/libomp/libomp-16.0.2.9999.ebuild
 2304142240 ./sys-libs/libomp/libomp-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/libomp/libomp-16.0.2.ebuild
+2304191910 ./sys-libs/libomp/libomp-16.0.3.9999.ebuild
 2302012140 ./sys-libs/libosinfo/libosinfo-1.10.0-r1.ebuild
 2302280440 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2111150410 ./sys-libs/librtas/librtas-2.0.2-r2.ebuild
@@ -25551,8 +25620,9 @@
 2301270140 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.7.ebuild
 2303251440 ./sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230325.ebuild
 2304052140 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.1.ebuild
-2304050940 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.9999.ebuild
 2304142240 ./sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230414.ebuild
+2304192310 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.ebuild
+2304191910 ./sys-libs/llvm-libunwind/llvm-libunwind-16.0.3.9999.ebuild
 2107081310 ./sys-libs/lwp/lwp-2.8.ebuild
 2205081040 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2201012339 ./sys-libs/musl-nscd/musl-nscd-1.1.1-r1.ebuild
@@ -25568,6 +25638,7 @@
 2304131040 ./sys-libs/ncurses/ncurses-6.4_p20230401.ebuild
 2304130510 ./sys-libs/ncurses/ncurses-6.4_p20230408.ebuild
 2304160640 ./sys-libs/ncurses/ncurses-6.4_p20230415.ebuild
+2304190610 ./sys-libs/ncurses/ncurses-6.4_p20230418.ebuild
 2303090410 ./sys-libs/newlib/newlib-4.1.0-r2.ebuild
 2303090410 ./sys-libs/newlib/newlib-4.2.0.20211231-r1.ebuild
 2303090410 ./sys-libs/newlib/newlib-4.3.0.20230120-r1.ebuild
@@ -25623,6 +25694,7 @@
 2302192252 ./sys-libs/pkgcraft/pkgcraft-9999.ebuild
 2303071540 ./sys-libs/libmodulemd/libmodulemd-2.14.0.ebuild
 2303071540 ./sys-libs/libmodulemd/libmodulemd-9999.ebuild
+2304201840 ./sys-libs/snapd-glib/snapd-glib-1.63.ebuild
 2303300010 ./sys-power/RyzenAdj/RyzenAdj-0.12.0.ebuild
 2303300010 ./sys-power/RyzenAdj/RyzenAdj-0.13.0.ebuild
 2110201309 ./sys-power/acpi/acpi-1.7-r1.ebuild
@@ -25679,6 +25751,7 @@
 2301251640 ./sys-process/below/below-0.6.3.ebuild
 2302120511 ./sys-process/bottom/bottom-0.7.1.ebuild
 2303312010 ./sys-process/bottom/bottom-0.8.0.ebuild
+2304181640 ./sys-process/bottom/bottom-0.8.0-r1.ebuild
 2303061810 ./sys-process/bpytop/bpytop-1.0.68-r1.ebuild
 2301141613 ./sys-process/criu/criu-3.15-r3.ebuild
 2301141613 ./sys-process/criu/criu-3.15.ebuild
@@ -26038,7 +26111,7 @@
 1910071309 ./www-apache/mod_vdbh/mod_vdbh-1.0.3-r2.ebuild
 2111271610 ./www-apache/mod_whatkilledus/mod_whatkilledus-2.01-r1.ebuild
 2301141613 ./www-apache/mod_wsgi/mod_wsgi-4.9.0.ebuild
-2304091010 ./www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild
+2304191440 ./www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild
 2009260639 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
 2103111109 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r2.ebuild
 1805280108 ./www-apache/modsec-flameeyes/modsec-flameeyes-20130216.ebuild
@@ -26071,10 +26144,10 @@
 2301071440 ./www-apps/davical/davical-1.1.11.ebuild
 2304141010 ./www-apps/dokuwiki/dokuwiki-20230404.ebuild
 2203212239 ./www-apps/dotproject/dotproject-2.1.7-r2.ebuild
-2303160940 ./www-apps/drupal/drupal-10.0.5.ebuild
-2303160940 ./www-apps/drupal/drupal-7.95.ebuild
-2303160940 ./www-apps/drupal/drupal-9.4.12.ebuild
-2303160940 ./www-apps/drupal/drupal-9.5.5.ebuild
+2304192140 ./www-apps/drupal/drupal-10.0.8.ebuild
+2304192140 ./www-apps/drupal/drupal-7.96.ebuild
+2304192140 ./www-apps/drupal/drupal-9.4.14.ebuild
+2304192140 ./www-apps/drupal/drupal-9.5.8.ebuild
 2303040240 ./www-apps/element/element-1.11.24.ebuild
 2304131410 ./www-apps/element/element-1.11.29.ebuild
 2301270940 ./www-apps/gitea/gitea-1.18.3.ebuild
@@ -26175,7 +26248,7 @@
 2211161140 ./www-apps/wordpress/wordpress-6.1.1.ebuild
 2303300810 ./www-apps/wordpress/wordpress-6.2.ebuild
 2301141613 ./www-apps/xpra-html5/xpra-html5-5.0.ebuild
-2301141613 ./www-apps/xpra-html5/xpra-html5-6.1.ebuild
+2304200740 ./www-apps/xpra-html5/xpra-html5-6.1.ebuild
 2209050140 ./www-apps/zeppelin-bin/zeppelin-bin-0.10.1.ebuild
 2303041140 ./www-apps/selfoss/selfoss-2.19.ebuild
 2208090440 ./www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
@@ -26194,7 +26267,8 @@
 2211232110 ./www-apps/icingadb-web/icingadb-web-1.0.2.ebuild
 2303242240 ./www-client/chromium/chromium-111.0.5563.64.ebuild
 2304032040 ./www-client/chromium/chromium-111.0.5563.110-r1.ebuild
-2304141910 ./www-client/chromium/chromium-112.0.5615.49.ebuild
+2304202110 ./www-client/chromium/chromium-112.0.5615.121.ebuild
+2304181840 ./www-client/chromium/chromium-112.0.5615.49.ebuild
 2301141613 ./www-client/elinks/elinks-0.13.5-r100.ebuild
 2301141613 ./www-client/elinks/elinks-0.15.1-r1.ebuild
 2304141910 ./www-client/elinks/elinks-0.16.0.ebuild
@@ -26208,7 +26282,7 @@
 2304180910 ./www-client/firefox-bin/firefox-bin-112.0.1.ebuild
 2304141240 ./www-client/firefox/firefox-102.10.0.ebuild
 2304141540 ./www-client/firefox/firefox-112.0.ebuild
-2304181140 ./www-client/firefox/firefox-112.0.1.ebuild
+2304190940 ./www-client/firefox/firefox-112.0.1.ebuild
 2304171810 ./www-client/google-chrome-beta/google-chrome-beta-113.0.5672.37.ebuild
 2304111910 ./www-client/google-chrome-unstable/google-chrome-unstable-114.0.5696.0.ebuild
 2304171810 ./www-client/google-chrome/google-chrome-112.0.5615.121.ebuild
@@ -26284,8 +26358,8 @@
 2112260340 ./www-misc/profile-sync-daemon/profile-sync-daemon-9999.ebuild
 2008051739 ./www-misc/shellinabox/shellinabox-2.20-r4.ebuild
 2301141613 ./www-misc/urlwatch/urlwatch-2.24.ebuild
-2302262340 ./www-misc/urlwatch/urlwatch-2.25.ebuild
 2304122240 ./www-misc/urlwatch/urlwatch-2.26.ebuild
+2304191310 ./www-misc/urlwatch/urlwatch-2.25.ebuild
 2107310240 ./www-misc/vdradmin-am/vdradmin-am-3.6.10-r1.ebuild
 2105091239 ./www-misc/vdradmin-am/vdradmin-am-3.6.10-r2.ebuild
 2203200310 ./www-misc/visitors/visitors-0.7-r2.ebuild
@@ -26324,10 +26398,10 @@
 2207172110 ./www-servers/moonbridge/moonbridge-1.0.1.ebuild
 2301201710 ./www-servers/nginx-unit/nginx-unit-1.29.0.ebuild
 2303021810 ./www-servers/nginx-unit/nginx-unit-1.29.1.ebuild
-2210191810 ./www-servers/nginx/nginx-1.23.2.ebuild
 2301131740 ./www-servers/nginx/nginx-1.23.2-r3.ebuild
 2303310040 ./www-servers/nginx/nginx-1.23.4.ebuild
 2304011940 ./www-servers/nginx/nginx-1.23.3.ebuild
+2304190010 ./www-servers/nginx/nginx-1.24.0.ebuild
 2208160840 ./www-servers/pound/pound-3.0.2.ebuild
 2105022339 ./www-servers/pshs/pshs-0.4.1.ebuild
 2206040910 ./www-servers/puma/puma-5.6.4.ebuild
@@ -26349,6 +26423,9 @@
 2303230210 ./www-servers/tomcat/tomcat-10.1.7.ebuild
 2303230210 ./www-servers/tomcat/tomcat-8.5.87.ebuild
 2303230210 ./www-servers/tomcat/tomcat-9.0.73.ebuild
+2304201010 ./www-servers/tomcat/tomcat-10.1.8.ebuild
+2304201010 ./www-servers/tomcat/tomcat-8.5.88.ebuild
+2304191010 ./www-servers/tomcat/tomcat-9.0.74.ebuild
 2304130610 ./www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
 2304130610 ./www-servers/uwsgi/uwsgi-2.0.21.ebuild
 2211180810 ./www-servers/varnish/varnish-7.1.1-r1.ebuild
@@ -26637,7 +26714,7 @@
 2212160511 ./x11-libs/wxGTK/wxGTK-3.0.4-r5.ebuild
 2212160511 ./x11-libs/wxGTK/wxGTK-3.0.5.1-r1.ebuild
 2302100810 ./x11-libs/wxGTK/wxGTK-3.2.1.ebuild
-2304022310 ./x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild
+2304191440 ./x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild
 2012311940 ./x11-libs/xbae/xbae-4.60.4.ebuild
 2212030940 ./x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.4.ebuild
 2212030940 ./x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild
@@ -26707,9 +26784,8 @@
 2203162040 ./x11-misc/dmenu/dmenu-5.1.ebuild
 2203162040 ./x11-misc/dmenu/dmenu-9999.ebuild
 2210072240 ./x11-misc/dmenu/dmenu-5.2.ebuild
-2207292240 ./x11-misc/dunst/dunst-1.9.0.ebuild
-2303122210 ./x11-misc/dunst/dunst-1.9.1.ebuild
 2303122210 ./x11-misc/dunst/dunst-9999.ebuild
+2304190010 ./x11-misc/dunst/dunst-1.9.1.ebuild
 2304161610 ./x11-misc/dxpc/dxpc-3.9.2-r3.ebuild
 2103271939 ./x11-misc/dzen/dzen-0.9.5_p2.ebuild
 2112110210 ./x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild
@@ -26811,15 +26887,15 @@
 2205251440 ./x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
 2002112051 ./x11-misc/peksystray/peksystray-0.4.0.ebuild
 2301141613 ./x11-misc/picom/picom-10.1.ebuild
-2301141613 ./x11-misc/picom/picom-10.2.ebuild
 2301141613 ./x11-misc/picom/picom-9.1.ebuild
 2301141613 ./x11-misc/picom/picom-9999.ebuild
+2304200810 ./x11-misc/picom/picom-10.2.ebuild
 2206121410 ./x11-misc/piedock/piedock-1.6.9.ebuild
 2302281540 ./x11-misc/polybar/polybar-3.6.3-r2.ebuild
 2012232339 ./x11-misc/prime-run/prime-run-1.0.ebuild
 2303310340 ./x11-misc/primus/primus-0.2-r3.ebuild
 2205050010 ./x11-misc/projecteur/projecteur-0.9.2.ebuild
-2302171610 ./x11-misc/py3status/py3status-3.49.ebuild
+2304191140 ./x11-misc/py3status/py3status-3.50.ebuild
 2005202109 ./x11-misc/qarma/qarma-1.ebuild
 2107041710 ./x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
 2207271210 ./x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -27030,7 +27106,7 @@
 2205121740 ./x11-misc/xystray/xystray-1.0-r1.ebuild
 2002112051 ./x11-misc/yabar/yabar-0.4.0_p20190316-r1.ebuild
 2301141613 ./x11-misc/zim/zim-0.74.3.ebuild
-2301141613 ./x11-misc/zim/zim-0.75.1.ebuild
+2304200810 ./x11-misc/zim/zim-0.75.1.ebuild
 2301141613 ./x11-misc/meteo/meteo-0.9.9.1-r2.ebuild
 2303072040 ./x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.2.ebuild
 2301141613 ./x11-misc/gammastep/gammastep-2.0.9.ebuild
@@ -27089,7 +27165,6 @@
 2109091040 ./x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild
 2202170140 ./x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3-r1.ebuild
 2109091040 ./x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
-2301221610 ./x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
 2302271840 ./x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r2.ebuild
 2109091040 ./x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
 2109091040 ./x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
@@ -27272,13 +27347,11 @@
 2301262110 ./x11-terms/st-terminfo/st-terminfo-0.9.ebuild
 2304010940 ./x11-terms/wezterm/wezterm-20230326.111934.ebuild
 2304090440 ./x11-terms/wezterm/wezterm-20230408.112425.ebuild
-2205050140 ./x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
-2212020140 ./x11-themes/QGnomePlatform/QGnomePlatform-0.9.0.ebuild
+2304201640 ./x11-themes/QGnomePlatform/QGnomePlatform-0.9.0-r1.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
 2205171110 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
 2303260210 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-44.0.ebuild
 2304020511 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-43_p1.ebuild
-2201130510 ./x11-themes/adwaita-qt/adwaita-qt-1.4.1.ebuild
 2212020140 ./x11-themes/adwaita-qt/adwaita-qt-1.4.2.ebuild
 2302200110 ./x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
 2107180940 ./x11-themes/arc-theme/arc-theme-20210412.ebuild
@@ -27389,7 +27462,7 @@
 2201151640 ./x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild
 2201151640 ./x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild
 2302221840 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20230104.ebuild
-2303011910 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
+2304181840 ./x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
 2104262239 ./x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0-r1.ebuild
 2110211409 ./x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild
 2302210010 ./x11-themes/pulse-glass/pulse-glass-20100616-r1.ebuild
@@ -27528,6 +27601,7 @@
 2303171210 ./xfce-base/exo/exo-4.18.0.ebuild
 2303171210 ./xfce-base/garcon/garcon-4.18.0.ebuild
 2303282140 ./xfce-base/garcon/garcon-4.18.1.ebuild
+2304181940 ./xfce-base/garcon/garcon-4.19.0.ebuild
 2303172010 ./xfce-base/libxfce4ui/libxfce4ui-4.18.2.ebuild
 2303282140 ./xfce-base/libxfce4ui/libxfce4ui-4.18.3.ebuild
 2304171910 ./xfce-base/libxfce4ui/libxfce4ui-4.19.0.ebuild
@@ -27535,6 +27609,7 @@
 2304171710 ./xfce-base/libxfce4util/libxfce4util-4.19.0.ebuild
 2303171840 ./xfce-base/thunar/thunar-4.18.4.ebuild
 2303171210 ./xfce-base/xfce4-appfinder/xfce4-appfinder-4.18.0.ebuild
+2304200540 ./xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
 2303171210 ./xfce-base/xfce4-meta/xfce4-meta-4.18.ebuild
 2302242040 ./xfce-base/xfce4-panel/xfce4-panel-4.19.0.ebuild
 2303171740 ./xfce-base/xfce4-panel/xfce4-panel-4.18.2.ebuild
@@ -27542,7 +27617,9 @@
 2304150010 ./xfce-base/xfce4-panel/xfce4-panel-4.19.1-r1.ebuild
 2303172240 ./xfce-base/xfce4-session/xfce4-session-4.18.1-r1.ebuild
 2303282140 ./xfce-base/xfce4-session/xfce4-session-4.18.2.ebuild
+2304182010 ./xfce-base/xfce4-session/xfce4-session-4.19.0.ebuild
 2303171810 ./xfce-base/xfce4-settings/xfce4-settings-4.18.2.ebuild
+2304182140 ./xfce-base/xfce4-settings/xfce4-settings-4.19.0.ebuild
 2303171210 ./xfce-base/xfconf/xfconf-4.18.0.ebuild
 2304171710 ./xfce-base/xfconf/xfconf-4.18.1.ebuild
 2304171710 ./xfce-base/xfconf/xfconf-4.19.0.ebuild
@@ -27555,6 +27632,7 @@
 2304171710 ./xfce-base/tumbler/tumbler-4.18.1.ebuild
 2304171710 ./xfce-base/tumbler/tumbler-4.19.0.ebuild
 2303172210 ./xfce-base/xfce4-power-manager/xfce4-power-manager-4.18.1.ebuild
+2304182010 ./xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.0.ebuild
 2304150010 ./xfce-base/libxfce4windowing/libxfce4windowing-4.19.1.ebuild
 2206071310 ./xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.5.0.ebuild
 2304010940 ./xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.5.1.ebuild
@@ -27563,7 +27641,9 @@
 2111190939 ./xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.2.0.ebuild
 2206281340 ./xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.3.0-r1.ebuild
 2206191710 ./xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.4.ebuild
+2304200540 ./xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
 2111190939 ./xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.1.ebuild
+2304200540 ./xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
 2111190939 ./xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.2.ebuild
 2303210911 ./xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.3.ebuild
 2303171210 ./xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.8.ebuild
@@ -27573,6 +27653,7 @@
 2206191710 ./xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.7.0.ebuild
 2206061341 ./xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.6.0.ebuild
 2206191710 ./xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.2.ebuild
+2304200540 ./xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild
 2111190939 ./xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.1.1.ebuild
 2103191839 ./xfce-extra/xfce4-hdaps/xfce4-hdaps-1.0.3.ebuild
 2201090240 ./xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.4.1.ebuild
@@ -27598,6 +27679,7 @@
 2302031610 ./xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.5.5.ebuild
 2111190939 ./xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.2.ebuild
 2206191710 ./xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
+2304182010 ./xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.2.ebuild
 2206191710 ./xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.1.ebuild
 2211262010 ./xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
 2207260512 ./xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
@@ -27633,8 +27715,8 @@
 2304130410 ./app-containers/docker-cli/docker-cli-23.0.3.ebuild
 2301141613 ./app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
 2301141613 ./app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
-2303100540 ./app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
 2304130510 ./app-containers/docker-compose/docker-compose-2.17.2.ebuild
+2304200810 ./app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
 2112201210 ./app-containers/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
 2304130410 ./app-containers/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild
 2209230010 ./app-containers/docker-registry/docker-registry-2.8.1.ebuild
@@ -27810,10 +27892,12 @@
 2302072110 ./sec-keys/openpgp-keys-yubico/openpgp-keys-yubico-20220824.ebuild
 2210161710 ./sec-keys/openpgp-keys-knot-resolver/openpgp-keys-knot-resolver-20221016.ebuild
 2211090640 ./sec-keys/openpgp-keys-apache-commons/openpgp-keys-apache-commons-20221022.ebuild
-2301151310 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild
 2303032110 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.73.ebuild
 2303041640 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.7.ebuild
 2303041610 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.87.ebuild
+2304201010 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild
+2304201010 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild
+2304191010 ./sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.74.ebuild
 2301202010 ./sec-keys/openpgp-keys-apache-xalan-c/openpgp-keys-apache-xalan-c-20221123.ebuild
 2211250440 ./sec-keys/openpgp-keys-yorhel/openpgp-keys-yorhel-20221110.ebuild
 2212080740 ./sec-keys/openpgp-keys-dealii/openpgp-keys-dealii-20221207.ebuild
@@ -28781,11 +28865,12 @@
 2304071910 metadata/md5-cache/app-accessibility/espeak-1.48.04-r1
 2304081740 metadata/md5-cache/app-accessibility/kontrast-22.12.3
 2304160710 metadata/md5-cache/app-accessibility/flite-2.2
-2304180340 metadata/md5-cache/app-accessibility/Manifest.gz
 2304180340 metadata/md5-cache/app-accessibility/emacspeak-56.0-r1
 2304180340 metadata/md5-cache/app-accessibility/emacspeak-9999
 2304180340 metadata/md5-cache/app-accessibility/speechd-el-2.11
 2304180340 metadata/md5-cache/app-accessibility/speechd-el-2.8
+2304190610 metadata/md5-cache/app-accessibility/Manifest.gz
+2304190610 metadata/md5-cache/app-accessibility/speech-tools-2.5.0-r2
 2107101839 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r2
 2107101809 metadata/md5-cache/app-admin/aerospike-amc-community-5.0.0
 2104031909 metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -28945,7 +29030,6 @@
 2303261522 metadata/md5-cache/app-admin/sshguard-2.4.2
 2303261522 metadata/md5-cache/app-admin/sshguard-99999
 2303261522 metadata/md5-cache/app-admin/stow-2.3.1
-2303261522 metadata/md5-cache/app-admin/su-exec-0.2
 2303261522 metadata/md5-cache/app-admin/sud-1.3-r2
 2303261522 metadata/md5-cache/app-admin/sudo-1.9.12_p2
 2303261522 metadata/md5-cache/app-admin/sudo-9999
@@ -28998,8 +29082,6 @@
 2304051141 metadata/md5-cache/app-admin/cdist-7.0.0
 2304051141 metadata/md5-cache/app-admin/clustershell-1.9
 2304051141 metadata/md5-cache/app-admin/clustershell-1.9.1
-2304051141 metadata/md5-cache/app-admin/djbdns-logparse-0.0.2
-2304051141 metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1
 2304051141 metadata/md5-cache/app-admin/eclean-kernel-2.99.3
 2304051141 metadata/md5-cache/app-admin/eclean-kernel-2.99.4
 2304051141 metadata/md5-cache/app-admin/eclean-kernel-9999
@@ -29065,7 +29147,6 @@
 2304141910 metadata/md5-cache/app-admin/pydf-12-r2
 2304150840 metadata/md5-cache/app-admin/awscli-1.27.114
 2304151640 metadata/md5-cache/app-admin/hcloud-1.33.0
-2304181340 metadata/md5-cache/app-admin/Manifest.gz
 2304180610 metadata/md5-cache/app-admin/awscli-1.27.115
 2304180040 metadata/md5-cache/app-admin/cli53-0.8.18
 2304181040 metadata/md5-cache/app-admin/clog-1.3.0-r1
@@ -29104,7 +29185,6 @@
 2304180040 metadata/md5-cache/app-admin/serf-0.10.1
 2304180040 metadata/md5-cache/app-admin/serf-0.9.8
 2304181340 metadata/md5-cache/app-admin/syslog-ng-4.0.1
-2304171910 metadata/md5-cache/app-admin/syslog-ng-4.1.1
 2304180040 metadata/md5-cache/app-admin/terraform-1.3.9
 2304180040 metadata/md5-cache/app-admin/terraform-1.4.2
 2304180040 metadata/md5-cache/app-admin/vault-1.10.7
@@ -29116,6 +29196,12 @@
 2304180040 metadata/md5-cache/app-admin/vault-1.12.1
 2304180040 metadata/md5-cache/app-admin/vault-1.12.2
 2304180040 metadata/md5-cache/app-admin/vault-1.12.5
+2304200540 metadata/md5-cache/app-admin/Manifest.gz
+2304200540 metadata/md5-cache/app-admin/awscli-1.27.116
+2304191540 metadata/md5-cache/app-admin/djbdns-logparse-0.0.2-r1
+2304200511 metadata/md5-cache/app-admin/rsyslog-8.2304.0
+2304181710 metadata/md5-cache/app-admin/su-exec-0.2
+2304190940 metadata/md5-cache/app-admin/syslog-ng-4.1.1-r1
 2303261522 metadata/md5-cache/app-antivirus/clamav-0.103.7-r1
 2303261541 metadata/md5-cache/app-antivirus/clamav-1.0.1
 2303261522 metadata/md5-cache/app-antivirus/clamtk-6.14
@@ -29262,15 +29348,15 @@
 2304082110 metadata/md5-cache/app-arch/advancecomp-2.5
 2304082110 metadata/md5-cache/app-arch/bzip3-1.3.0
 2304082110 metadata/md5-cache/app-arch/libarchive-3.6.2-r1
-2304091940 metadata/md5-cache/app-arch/vimball-0.5.1-r1
 2304091940 metadata/md5-cache/app-arch/vimball-9999
 2304140910 metadata/md5-cache/app-arch/lzop-1.04-r1
 2304121740 metadata/md5-cache/app-arch/zip-3.0-r7
 2304150940 metadata/md5-cache/app-arch/engrampa-1.26.0-r1
 2304161010 metadata/md5-cache/app-arch/p7zip-17.05-r1
 2304161040 metadata/md5-cache/app-arch/unrar-6.2.6
-2304180140 metadata/md5-cache/app-arch/Manifest.gz
 2304180140 metadata/md5-cache/app-arch/lxqt-archiver-0.8.0
+2304191440 metadata/md5-cache/app-arch/Manifest.gz
+2304191440 metadata/md5-cache/app-arch/vimball-0.5.1-r1
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
 2106300039 metadata/md5-cache/app-backup/cdbkup-1.0-r4
 1712281839 metadata/md5-cache/app-backup/hdup-2.0.14
@@ -29297,7 +29383,6 @@
 2303261522 metadata/md5-cache/app-backup/btrbk-9999
 2303261522 metadata/md5-cache/app-backup/burp-2.4.0-r2
 2303261522 metadata/md5-cache/app-backup/burp-3.1.2
-2303261522 metadata/md5-cache/app-backup/burp-3.1.4
 2303261522 metadata/md5-cache/app-backup/cdbackup-0.7.1-r1
 2303261522 metadata/md5-cache/app-backup/cpdup-1.18
 2303261522 metadata/md5-cache/app-backup/dar-2.7.8
@@ -29333,8 +29418,6 @@
 2304031110 metadata/md5-cache/app-backup/mkstage4-9999
 2304051141 metadata/md5-cache/app-backup/rdiff-backup-2.0.5-r1
 2304051141 metadata/md5-cache/app-backup/rdiff-backup-2.2.4-r1
-2304051141 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0
-2304051141 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1
 2304061910 metadata/md5-cache/app-backup/spideroak-bin-7.5.0-r2
 2304071540 metadata/md5-cache/app-backup/tsm-8.1.13.3
 2304071540 metadata/md5-cache/app-backup/tsm-8.1.15.0
@@ -29342,11 +29425,13 @@
 2304081740 metadata/md5-cache/app-backup/kup-0.9.1
 2304141140 metadata/md5-cache/app-backup/borgmatic-1.7.8
 2304150940 metadata/md5-cache/app-backup/amanda-3.5.1-r4
-2304180040 metadata/md5-cache/app-backup/Manifest.gz
 2304180040 metadata/md5-cache/app-backup/consul-backinator-1.6.6
 2304180040 metadata/md5-cache/app-backup/restic-0.13.1
 2304180040 metadata/md5-cache/app-backup/restic-0.14.0
 2304180040 metadata/md5-cache/app-backup/restic-0.15.1
+2304191540 metadata/md5-cache/app-backup/Manifest.gz
+2304190440 metadata/md5-cache/app-backup/burp-3.1.4
+2304191540 metadata/md5-cache/app-backup/untangle-https-backup-0.1.0-r1
 2109012139 metadata/md5-cache/app-benchmarks/bonnie++-2.00a
 1907151840 metadata/md5-cache/app-benchmarks/forkbomb-1.4-r1
 2110300109 metadata/md5-cache/app-benchmarks/geekbench-2.4.2-r1
@@ -29379,13 +29464,13 @@
 2303261522 metadata/md5-cache/app-benchmarks/sysbench-1.0.20-r101
 2303261522 metadata/md5-cache/app-benchmarks/tiobench-0.5.0
 2303290513 metadata/md5-cache/app-benchmarks/bootchart2-0.14.9-r1
-2303290513 metadata/md5-cache/app-benchmarks/stress-ng-0.15.06
 2304032240 metadata/md5-cache/app-benchmarks/geekbench-6.0.1
 2304060240 metadata/md5-cache/app-benchmarks/hyperfine-1.16.1
 2304092240 metadata/md5-cache/app-benchmarks/geekbench-6.0.2
 2304110140 metadata/md5-cache/app-benchmarks/wrk-4.2.0
-2304180040 metadata/md5-cache/app-benchmarks/Manifest.gz
 2304180040 metadata/md5-cache/app-benchmarks/hey-0.1.2
+2304190010 metadata/md5-cache/app-benchmarks/Manifest.gz
+2304190010 metadata/md5-cache/app-benchmarks/stress-ng-0.15.07
 2105142109 metadata/md5-cache/app-cdr/bashburn-3.1.0-r2
 2005181609 metadata/md5-cache/app-cdr/geteltorito-0.6
 2107270209 metadata/md5-cache/app-cdr/iat-0.1.7-r1
@@ -29495,14 +29580,12 @@
 2303261522 metadata/md5-cache/app-crypt/chntpw-140201-r1
 2303261522 metadata/md5-cache/app-crypt/ckpass-0.2-r2
 2303261522 metadata/md5-cache/app-crypt/codecrypt-1.8-r2
-2303261522 metadata/md5-cache/app-crypt/codegroup-20080907-r1
 2303261522 metadata/md5-cache/app-crypt/coolkey-1.1.0-r9
 2303261522 metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
 2303261522 metadata/md5-cache/app-crypt/efitools-1.9.2-r1
 2303261522 metadata/md5-cache/app-crypt/eid-mw-5.1.10
 2303261522 metadata/md5-cache/app-crypt/eid-mw-9999
 2303261522 metadata/md5-cache/app-crypt/elettra-1.0
-2303261522 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
 2303261522 metadata/md5-cache/app-crypt/gnupg-2.2.40
 2303261522 metadata/md5-cache/app-crypt/gnupg-2.3.8
 2303261522 metadata/md5-cache/app-crypt/gnupg-2.4.0
@@ -29657,7 +29740,6 @@
 2304150310 metadata/md5-cache/app-crypt/libnitrokey-9999
 2304150940 metadata/md5-cache/app-crypt/seahorse-43.0-r2
 2304160710 metadata/md5-cache/app-crypt/trousers-0.3.15-r1
-2304180540 metadata/md5-cache/app-crypt/Manifest.gz
 2304180040 metadata/md5-cache/app-crypt/age-1.0.0
 2304180040 metadata/md5-cache/app-crypt/age-1.1.1
 2304180040 metadata/md5-cache/app-crypt/cfssl-1.4.1
@@ -29670,6 +29752,9 @@
 2304180040 metadata/md5-cache/app-crypt/sbctl-0.10
 2304180040 metadata/md5-cache/app-crypt/sbctl-0.11
 2304180040 metadata/md5-cache/app-crypt/yubihsm-connector-3.0.4
+2304182240 metadata/md5-cache/app-crypt/Manifest.gz
+2304182240 metadata/md5-cache/app-crypt/codegroup-20080907-r1
+2304181710 metadata/md5-cache/app-crypt/gifshuffle-2.0-r1
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/edictionary-2.6-r1
@@ -30006,9 +30091,11 @@
 2303311510 metadata/md5-cache/app-doc/doxygen-1.9.6
 2304051141 metadata/md5-cache/app-doc/cppman-0.5.4-r1
 2304131840 metadata/md5-cache/app-doc/doxygen-1.9.5
-2304180340 metadata/md5-cache/app-doc/Manifest.gz
 2304180340 metadata/md5-cache/app-doc/casting-spels-emacs-19-r3
 2304180040 metadata/md5-cache/app-doc/eclass-manpages-20230417
+2304192110 metadata/md5-cache/app-doc/Manifest.gz
+2304192110 metadata/md5-cache/app-doc/kicad-doc-6.0.11
+2304192110 metadata/md5-cache/app-doc/kicad-doc-7.0.1
 2110220439 metadata/md5-cache/app-editors/bvi-1.4.1
 2012280339 metadata/md5-cache/app-editors/jupp-3.1_p40
 1905250139 metadata/md5-cache/app-editors/le-1.16.5
@@ -30043,7 +30130,6 @@
 2303261522 metadata/md5-cache/app-editors/hyx-2021.06.09
 2303261522 metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r4
 2303261522 metadata/md5-cache/app-editors/jedit-5.4.0-r2
-2303261522 metadata/md5-cache/app-editors/joe-4.6-r2
 2303261522 metadata/md5-cache/app-editors/jove-4.16.0.73-r1
 2303261522 metadata/md5-cache/app-editors/jove-4.17.3.7
 2303261541 metadata/md5-cache/app-editors/juffed-0.10_p20200103
@@ -30116,7 +30202,6 @@
 2304020410 metadata/md5-cache/app-editors/pluma-1.26.0
 2304020410 metadata/md5-cache/app-editors/pluma-plugins-1.26.0
 2304051141 metadata/md5-cache/app-editors/pyvim-3.0.2
-2304051141 metadata/md5-cache/app-editors/pyvim-3.0.3
 2304051141 metadata/md5-cache/app-editors/retext-7.2.3
 2304051141 metadata/md5-cache/app-editors/retext-8.0.0
 2304051141 metadata/md5-cache/app-editors/retext-9999
@@ -30148,7 +30233,6 @@
 2304120310 metadata/md5-cache/app-editors/helix-23.03
 2304132240 metadata/md5-cache/app-editors/neovim-0.9.0-r1
 2304132240 metadata/md5-cache/app-editors/neovim-9999
-2304180340 metadata/md5-cache/app-editors/Manifest.gz
 2304180340 metadata/md5-cache/app-editors/emacs-25.3-r15
 2304180340 metadata/md5-cache/app-editors/emacs-25.3-r16
 2304180340 metadata/md5-cache/app-editors/emacs-25.3-r18
@@ -30168,7 +30252,9 @@
 2304162310 metadata/md5-cache/app-editors/ghostwriter-23.03.90
 2304180040 metadata/md5-cache/app-editors/micro-2.0.10
 2304180040 metadata/md5-cache/app-editors/micro-2.0.9
-2304180340 metadata/md5-cache/app-emacs/Manifest.gz
+2304191440 metadata/md5-cache/app-editors/Manifest.gz
+2304191140 metadata/md5-cache/app-editors/joe-4.6-r2
+2304191440 metadata/md5-cache/app-editors/pyvim-3.0.3
 2304180340 metadata/md5-cache/app-emacs/a-1.0.0
 2304180340 metadata/md5-cache/app-emacs/ace-window-0.10.0
 2304180340 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -30181,7 +30267,6 @@
 2304180340 metadata/md5-cache/app-emacs/all-the-icons-ibuffer-1.3.0
 2304180340 metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.7.1
 2304180340 metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.8.0
-2304180340 metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
 2304180340 metadata/md5-cache/app-emacs/amx-3.4
 2304180340 metadata/md5-cache/app-emacs/analog-1.9.99
 2304180340 metadata/md5-cache/app-emacs/anaphora-1.0.4
@@ -30229,7 +30314,6 @@
 2304180340 metadata/md5-cache/app-emacs/bubblet-0.74-r1
 2304180340 metadata/md5-cache/app-emacs/buffer-extension-0.1-r1
 2304180340 metadata/md5-cache/app-emacs/bui-1.2.1_p20210108
-2304180340 metadata/md5-cache/app-emacs/buttercup-1.26
 2304180340 metadata/md5-cache/app-emacs/buttercup-1.28
 2304180340 metadata/md5-cache/app-emacs/buttercup-1.29
 2304180340 metadata/md5-cache/app-emacs/buttercup-1.30
@@ -30246,7 +30330,6 @@
 2304180340 metadata/md5-cache/app-emacs/circe-2.11
 2304180340 metadata/md5-cache/app-emacs/circe-2.12
 2304180340 metadata/md5-cache/app-emacs/citar-1.1
-2304180340 metadata/md5-cache/app-emacs/citar-1.2.0
 2304180340 metadata/md5-cache/app-emacs/citar-1.3.1
 2304180340 metadata/md5-cache/app-emacs/citeproc-el-0.9.1
 2304180340 metadata/md5-cache/app-emacs/citeproc-el-0.9.2
@@ -30613,7 +30696,6 @@
 2304180340 metadata/md5-cache/app-emacs/org-static-blog-1.6.0
 2304180340 metadata/md5-cache/app-emacs/org-superstar-mode-1.5.0
 2304180340 metadata/md5-cache/app-emacs/osm-0.10
-2304180340 metadata/md5-cache/app-emacs/osm-0.9
 2304180340 metadata/md5-cache/app-emacs/outline-magic-0.9
 2304180340 metadata/md5-cache/app-emacs/package-build-3.1
 2304180340 metadata/md5-cache/app-emacs/package-build-3.2
@@ -30658,9 +30740,6 @@
 2304180340 metadata/md5-cache/app-emacs/powerline-2.5_p20221110
 2304180340 metadata/md5-cache/app-emacs/powershell-0.3_pre20220402
 2304180340 metadata/md5-cache/app-emacs/powershell-0.3_pre20220805
-2304180340 metadata/md5-cache/app-emacs/projectile-2.5.0-r1
-2304180340 metadata/md5-cache/app-emacs/projectile-2.6.0
-2304180340 metadata/md5-cache/app-emacs/projectile-2.7.0
 2304180340 metadata/md5-cache/app-emacs/proofgeneral-4.4
 2304180340 metadata/md5-cache/app-emacs/proofgeneral-4.5
 2304180340 metadata/md5-cache/app-emacs/proofgeneral-4.5_pre20220228
@@ -30722,7 +30801,6 @@
 2304180340 metadata/md5-cache/app-emacs/setup-1.3.0
 2304180340 metadata/md5-cache/app-emacs/setup-1.3.2
 2304180340 metadata/md5-cache/app-emacs/shell-split-string-0.1
-2304180340 metadata/md5-cache/app-emacs/shrink-path-0.3.1
 2304180340 metadata/md5-cache/app-emacs/shut-up-0.3.3
 2304180340 metadata/md5-cache/app-emacs/slime-2.27
 2304180340 metadata/md5-cache/app-emacs/slime-2.28
@@ -30827,6 +30905,18 @@
 2304180340 metadata/md5-cache/app-emacs/yatex-1.82
 2304180340 metadata/md5-cache/app-emacs/zenburn-20110907-r1
 2304180340 metadata/md5-cache/app-emacs/zenirc-2.112-r1
+2304201540 metadata/md5-cache/app-emacs/Manifest.gz
+2304200740 metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.9.0
+2304190010 metadata/md5-cache/app-emacs/buttercup-1.31
+2304200740 metadata/md5-cache/app-emacs/citar-1.2.0
+2304200310 metadata/md5-cache/app-emacs/doom-modeline-3.4.0
+2304190010 metadata/md5-cache/app-emacs/marginalia-1.2
+2304190010 metadata/md5-cache/app-emacs/org-mode-9.6.4
+2304190010 metadata/md5-cache/app-emacs/osm-0.11
+2304200310 metadata/md5-cache/app-emacs/projectile-2.5.0-r1
+2304200310 metadata/md5-cache/app-emacs/projectile-2.6.0
+2304201540 metadata/md5-cache/app-emacs/projectile-2.7.0
+2304200310 metadata/md5-cache/app-emacs/shrink-path-0.3.1
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 2110231809 metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
 2104161439 metadata/md5-cache/app-emulation/libvirt-snmp-0.0.4
@@ -30855,9 +30945,6 @@
 2303261522 metadata/md5-cache/app-emulation/coldfire-0.3.1
 2303261522 metadata/md5-cache/app-emulation/dinero-4.7-r1
 2303261522 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
-2303261522 metadata/md5-cache/app-emulation/dxvk-1.10.3
-2303261522 metadata/md5-cache/app-emulation/dxvk-2.0
-2303261522 metadata/md5-cache/app-emulation/dxvk-2.1
 2303261522 metadata/md5-cache/app-emulation/dxvk-9999
 2303261541 metadata/md5-cache/app-emulation/dynamips-0.2.21
 2303261541 metadata/md5-cache/app-emulation/faudio-23.02
@@ -30996,8 +31083,6 @@
 2304150010 metadata/md5-cache/app-emulation/diskimage-builder-3.29.0
 2304150910 metadata/md5-cache/app-emulation/open-vm-tools-12.1.0-r1
 2304150110 metadata/md5-cache/app-emulation/wine-vanilla-8.6
-2304180040 metadata/md5-cache/app-emulation/Manifest.gz
-2304180010 metadata/md5-cache/app-emulation/dxvk-2.1_p20230207
 2304171810 metadata/md5-cache/app-emulation/virtiofsd-1.5.1
 2304171810 metadata/md5-cache/app-emulation/virtiofsd-9999
 2304180040 metadata/md5-cache/app-emulation/vkd3d-1.7
@@ -31012,8 +31097,18 @@
 2304171140 metadata/md5-cache/app-emulation/xen-4.16.4_pre1
 2304171140 metadata/md5-cache/app-emulation/xen-4.17.1_pre1
 2304172340 metadata/md5-cache/app-emulation/xen-tools-4.15.5_pre1
-2304171140 metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
-2304171140 metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1
+2304201940 metadata/md5-cache/app-emulation/Manifest.gz
+2304191840 metadata/md5-cache/app-emulation/cloud-hypervisor-31.0
+2304191840 metadata/md5-cache/app-emulation/cloud-hypervisor-9999
+2304181840 metadata/md5-cache/app-emulation/crossover-bin-22.1.1
+2304190740 metadata/md5-cache/app-emulation/dxvk-1.10.3
+2304190740 metadata/md5-cache/app-emulation/dxvk-2.0
+2304190740 metadata/md5-cache/app-emulation/dxvk-2.1
+2304190740 metadata/md5-cache/app-emulation/dxvk-2.1_p20230207
+2304190810 metadata/md5-cache/app-emulation/wine-proton-8.0.1d
+2304201940 metadata/md5-cache/app-emulation/wine-vanilla-8.0.1
+2304190940 metadata/md5-cache/app-emulation/xen-tools-4.16.4_pre1
+2304190940 metadata/md5-cache/app-emulation/xen-tools-4.17.1_pre1
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
 2009051839 metadata/md5-cache/app-eselect/eselect-chuck-1.0.2
@@ -31062,10 +31157,10 @@
 2303261522 metadata/md5-cache/app-eselect/eselect-repository-13
 2303261522 metadata/md5-cache/app-eselect/eselect-rust-20210703
 2303261522 metadata/md5-cache/app-eselect/eselect-vi-1.2
-2303261522 metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
 2304091110 metadata/md5-cache/app-eselect/eselect-rails-0.26
-2304161540 metadata/md5-cache/app-eselect/Manifest.gz
 2304161540 metadata/md5-cache/app-eselect/eselect-timidity-20110513-r1
+2304191440 metadata/md5-cache/app-eselect/Manifest.gz
+2304191440 metadata/md5-cache/app-eselect/eselect-wxwidgets-20230114-r1
 2005211139 metadata/md5-cache/app-forensics/examiner-0.5-r3
 2201061240 metadata/md5-cache/app-forensics/air-2.0.0-r2
 2212182310 metadata/md5-cache/app-forensics/libewf-20171104-r2
@@ -31495,7 +31590,6 @@
 2303261522 metadata/md5-cache/app-misc/g15stats-3.0.3
 2303261522 metadata/md5-cache/app-misc/g15stats-9999
 2303261522 metadata/md5-cache/app-misc/g810-led-0.3.6
-2303261522 metadata/md5-cache/app-misc/g810-led-0.4.2
 2303261522 metadata/md5-cache/app-misc/gcal-4.1-r1
 2303261522 metadata/md5-cache/app-misc/geekcode-1.7.3-r1
 2303261522 metadata/md5-cache/app-misc/geneweb-7.0.0_p1
@@ -31543,8 +31637,6 @@
 2303261522 metadata/md5-cache/app-misc/mc-4.8.28-r2
 2303261522 metadata/md5-cache/app-misc/mc-4.8.29
 2303261522 metadata/md5-cache/app-misc/mc-9999
-2303261522 metadata/md5-cache/app-misc/media-player-info-24
-2303261522 metadata/md5-cache/app-misc/media-player-info-24-r1
 2303261522 metadata/md5-cache/app-misc/mepl-0.45-r2
 2303261522 metadata/md5-cache/app-misc/mmv-1.01b_p19
 2303261522 metadata/md5-cache/app-misc/mosquitto-2.0.15
@@ -31566,7 +31658,6 @@
 2303261522 metadata/md5-cache/app-misc/ola-0.10.9
 2303261522 metadata/md5-cache/app-misc/ondir-0.2.4
 2303261522 metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
-2303261522 metadata/md5-cache/app-misc/openrgb-9999
 2303261522 metadata/md5-cache/app-misc/openrgb-plugin-effects-0.8
 2303261522 metadata/md5-cache/app-misc/openrgb-plugin-skin-0.8
 2303261522 metadata/md5-cache/app-misc/openrgb-plugin-visualmap-0.8
@@ -31665,13 +31756,11 @@
 2303272340 metadata/md5-cache/app-misc/jdupes-1.21.3
 2303290513 metadata/md5-cache/app-misc/lirc-0.10.1-r4
 2303290513 metadata/md5-cache/app-misc/lirc-0.10.1_p7
-2303290513 metadata/md5-cache/app-misc/lirc-0.10.2
 2303290513 metadata/md5-cache/app-misc/livecd-tools-2.10
 2303290513 metadata/md5-cache/app-misc/livecd-tools-2.9
 2303290513 metadata/md5-cache/app-misc/livecd-tools-9999
 2303290513 metadata/md5-cache/app-misc/logiops-0.2.3-r1
 2303292010 metadata/md5-cache/app-misc/mosquitto-2.0.15-r1
-2303290240 metadata/md5-cache/app-misc/openrgb-0.8-r1
 2303290513 metadata/md5-cache/app-misc/recoll-1.31.0
 2303290513 metadata/md5-cache/app-misc/recoll-1.32.0
 2303290513 metadata/md5-cache/app-misc/recoll-1.32.2
@@ -31720,7 +31809,6 @@
 2304051141 metadata/md5-cache/app-misc/resolve-march-native-1.0.0-r1
 2304051141 metadata/md5-cache/app-misc/resolve-march-native-2.1.0
 2304051141 metadata/md5-cache/app-misc/resolve-march-native-2.1.0-r1
-2304051141 metadata/md5-cache/app-misc/resolve-march-native-2.2.0
 2304031410 metadata/md5-cache/app-misc/rpick-0.8.13
 2304051141 metadata/md5-cache/app-misc/solaar-1.0.5-r2
 2304051141 metadata/md5-cache/app-misc/solaar-1.0.7
@@ -31765,7 +31853,6 @@
 2304132310 metadata/md5-cache/app-misc/zellij-0.36.0
 2304142310 metadata/md5-cache/app-misc/rdfind-1.5.0-r1
 2304151940 metadata/md5-cache/app-misc/vit-2.3.0
-2304180740 metadata/md5-cache/app-misc/Manifest.gz
 2304180340 metadata/md5-cache/app-misc/cdargs-1.35-r2
 2304180040 metadata/md5-cache/app-misc/dasel-1.26.1
 2304180040 metadata/md5-cache/app-misc/dasel-1.27.1
@@ -31786,6 +31873,13 @@
 2304180740 metadata/md5-cache/app-misc/tmux-mem-cpu-load-3.7.0
 2304180740 metadata/md5-cache/app-misc/tmux-mem-cpu-load-9999
 2304180040 metadata/md5-cache/app-misc/wally-cli-2.0.1
+2304201410 metadata/md5-cache/app-misc/Manifest.gz
+2304181640 metadata/md5-cache/app-misc/g810-led-0.4.2
+2304191310 metadata/md5-cache/app-misc/lirc-0.10.2
+2304190440 metadata/md5-cache/app-misc/media-player-info-24-r1
+2304201410 metadata/md5-cache/app-misc/openrgb-0.8-r1
+2304201410 metadata/md5-cache/app-misc/openrgb-9999
+2304200810 metadata/md5-cache/app-misc/resolve-march-native-2.2.0
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
 2303261522 metadata/md5-cache/app-mobilephone/adebar-2.4.1
@@ -31851,7 +31945,6 @@
 2304020410 metadata/md5-cache/app-office/planner-9999
 2304061910 metadata/md5-cache/app-office/onlyoffice-bin-7.3.3
 2304061910 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
-2304061910 metadata/md5-cache/app-office/wps-office-11.1.0.11664-r3
 2304061910 metadata/md5-cache/app-office/wps-office-11.1.0.11691
 2304081740 metadata/md5-cache/app-office/calligra-3.2.1-r5
 2304081740 metadata/md5-cache/app-office/calligra-3.2.1-r7
@@ -31874,8 +31967,8 @@
 2304160840 metadata/md5-cache/app-office/libreoffice-7.5.2.2-r1
 2304160840 metadata/md5-cache/app-office/libreoffice-7.5.9999
 2304160840 metadata/md5-cache/app-office/libreoffice-9999
-2304180340 metadata/md5-cache/app-office/Manifest.gz
 2304180340 metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
+2304181840 metadata/md5-cache/app-office/Manifest.gz
 2303261522 metadata/md5-cache/app-officeext/Manifest.gz
 2303261522 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2303261522 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -31942,7 +32035,6 @@
 2304051141 metadata/md5-cache/app-portage/elogv-0.7.9
 2304051141 metadata/md5-cache/app-portage/elogv-0.7.9-r1
 2304051141 metadata/md5-cache/app-portage/elogv-0.7.9-r2
-2304051141 metadata/md5-cache/app-portage/elogv-0.7.9-r3
 2304051141 metadata/md5-cache/app-portage/elsw-0.0.0-r1
 2304051141 metadata/md5-cache/app-portage/elsw-9999
 2304051141 metadata/md5-cache/app-portage/esearch-1.3-r3
@@ -31952,7 +32044,6 @@
 2304051141 metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.4-r3
 2304051141 metadata/md5-cache/app-portage/flaggie-0.2.1-r2
 2304051141 metadata/md5-cache/app-portage/flaggie-0.99.2
-2304051141 metadata/md5-cache/app-portage/flaggie-0.99.3
 2304051141 metadata/md5-cache/app-portage/g-octave-0.4.1-r7
 2304051141 metadata/md5-cache/app-portage/g-octave-0.4.1-r8
 2304051141 metadata/md5-cache/app-portage/g-sorcery-0.2.2-r1
@@ -31970,7 +32061,6 @@
 2304051141 metadata/md5-cache/app-portage/layman-9999
 2304051141 metadata/md5-cache/app-portage/metagen-0.7.3
 2304051141 metadata/md5-cache/app-portage/metagen-0.7.3-r1
-2304051141 metadata/md5-cache/app-portage/metagen-0.7.3-r2
 2304051141 metadata/md5-cache/app-portage/metagen-9999
 2304051141 metadata/md5-cache/app-portage/mirrorselect-2.2.6-r2
 2304051141 metadata/md5-cache/app-portage/mirrorselect-2.3.0-r1
@@ -31981,7 +32071,6 @@
 2304051141 metadata/md5-cache/app-portage/overlint-0.5.3-r4
 2304051141 metadata/md5-cache/app-portage/pfl-3.2-r2
 2304051141 metadata/md5-cache/app-portage/pkg-testing-tools-0.1.0
-2304051141 metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2
 2304051141 metadata/md5-cache/app-portage/recover-broken-vdb-1.0.0-r2
 2304051141 metadata/md5-cache/app-portage/recover-broken-vdb-9999
 2304051141 metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -32000,10 +32089,14 @@
 2304082110 metadata/md5-cache/app-portage/pycargoebuild-0.6.3
 2304082010 metadata/md5-cache/app-portage/smart-live-rebuild-1.4.1
 2304150940 metadata/md5-cache/app-portage/java-ebuilder-0.5.1-r1
-2304180040 metadata/md5-cache/app-portage/Manifest.gz
 2304180040 metadata/md5-cache/app-portage/pgo-0.0.2
 2304180040 metadata/md5-cache/app-portage/pgo-0.0.3
 2304180040 metadata/md5-cache/app-portage/pgo-9999
+2304200810 metadata/md5-cache/app-portage/Manifest.gz
+2304200810 metadata/md5-cache/app-portage/elogv-0.7.9-r3
+2304191310 metadata/md5-cache/app-portage/flaggie-0.99.3
+2304200740 metadata/md5-cache/app-portage/metagen-0.7.3-r2
+2304190610 metadata/md5-cache/app-portage/pkg-testing-tools-0.1.2
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -32211,7 +32304,6 @@
 2303261522 metadata/md5-cache/app-text/crf++-0.58-r1
 2303261522 metadata/md5-cache/app-text/crm114-20100106-r1
 2303261541 metadata/md5-cache/app-text/crqt-ng-1.0.9
-2303261541 metadata/md5-cache/app-text/crwx-ng-0.2.0-r2
 2303261541 metadata/md5-cache/app-text/cuneiform-1.1.0-r3
 2303261522 metadata/md5-cache/app-text/cwtext-0.96-r1
 2303261522 metadata/md5-cache/app-text/delta-20060803-r1
@@ -32400,7 +32492,6 @@
 2303261522 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2303261522 metadata/md5-cache/app-text/zathura-ps-0.2.7
 2303261522 metadata/md5-cache/app-text/zathura-ps-9999
-2303261522 metadata/md5-cache/app-text/zotero-bin-6.0.22
 2303261522 metadata/md5-cache/app-text/zotero-bin-6.0.23
 2303280410 metadata/md5-cache/app-text/pandoc-bin-3.1.2
 2303301940 metadata/md5-cache/app-text/discount-2.2.7c
@@ -32435,7 +32526,6 @@
 2304020410 metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
 2304051141 metadata/md5-cache/app-text/grip-4.6.1
 2304030910 metadata/md5-cache/app-text/groonga-8.0.2-r2
-2304020410 metadata/md5-cache/app-text/gspell-1.12.0
 2304020410 metadata/md5-cache/app-text/gtkspell-3.0.10-r1
 2304020410 metadata/md5-cache/app-text/gtranslator-42.0
 2304040810 metadata/md5-cache/app-text/html401-19991224-r4
@@ -32469,7 +32559,6 @@
 2304032240 metadata/md5-cache/app-text/tesseract-5.3.0
 2304051141 metadata/md5-cache/app-text/txt2tags-3.8
 2304051141 metadata/md5-cache/app-text/xapers-0.9.0
-2304021310 metadata/md5-cache/app-text/xapian-omega-1.4.22
 2304040810 metadata/md5-cache/app-text/xhtml1-20020801-r6
 2304040810 metadata/md5-cache/app-text/xhtml11-20101123
 2304051141 metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -32481,7 +32570,6 @@
 2304020410 metadata/md5-cache/app-text/xournal-0.4.8.2016-r1
 2304020410 metadata/md5-cache/app-text/xournal-9999
 2304020410 metadata/md5-cache/app-text/yelp-tools-42.1
-2304070640 metadata/md5-cache/app-text/crqt-ng-1.0.11
 2304071910 metadata/md5-cache/app-text/jabref-bin-3.8.2
 2304071910 metadata/md5-cache/app-text/jabref-bin-4.3.1
 2304071910 metadata/md5-cache/app-text/jabref-bin-4.9999
@@ -32518,19 +32606,25 @@
 2304150940 metadata/md5-cache/app-text/ttf2pt1-3.4.4-r2
 2304151210 metadata/md5-cache/app-text/zathura-cb-0.1.10
 2304161540 metadata/md5-cache/app-text/dos2unix-7.4.4
-2304181210 metadata/md5-cache/app-text/Manifest.gz
 2304180340 metadata/md5-cache/app-text/a2ps-4.14-r8
 2304180340 metadata/md5-cache/app-text/a2ps-4.15.2
 2304180340 metadata/md5-cache/app-text/a2ps-4.15.3
 2304180340 metadata/md5-cache/app-text/a2ps-4.15.4
 2304170240 metadata/md5-cache/app-text/ghostscript-gpl-10.01.1
-2304181210 metadata/md5-cache/app-text/highlight-4.1
 2304180340 metadata/md5-cache/app-text/namazu-2.0.21
 2304180340 metadata/md5-cache/app-text/namazu-2.0.22_pre8
 2304180040 metadata/md5-cache/app-text/vgrep-2.6.0
 2304180340 metadata/md5-cache/app-text/xdvik-22.87.03-r4
 2304180340 metadata/md5-cache/app-text/xdvik-22.87.06
 2304180340 metadata/md5-cache/app-text/xdvik-22.87.06-r1
+2304201610 metadata/md5-cache/app-text/Manifest.gz
+2304201310 metadata/md5-cache/app-text/crengine-ng-0.9.8
+2304201310 metadata/md5-cache/app-text/crqt-ng-1.0.11-r1
+2304201310 metadata/md5-cache/app-text/crwx-ng-0.2.0-r3
+2304191210 metadata/md5-cache/app-text/gspell-1.12.0
+2304191610 metadata/md5-cache/app-text/highlight-4.1
+2304201610 metadata/md5-cache/app-text/xapian-omega-1.4.22
+2304192010 metadata/md5-cache/app-text/zotero-bin-6.0.25
 2303261522 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2303261522 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2303261522 metadata/md5-cache/app-vim/ackvim-1.0.9-r2
@@ -32942,9 +33036,7 @@
 2303261541 metadata/md5-cache/dev-cpp/cctz-2.3_p20230228
 2303261541 metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r8
 2303261541 metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0-r1
-2303261541 metadata/md5-cache/dev-cpp/cpp-httplib-0.11.3
 2303261541 metadata/md5-cache/dev-cpp/cpp-httplib-0.11.4
-2303261541 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
 2303261541 metadata/md5-cache/dev-cpp/curlpp-0.8.1
 2303261541 metadata/md5-cache/dev-cpp/doctest-2.4.10
 2303261541 metadata/md5-cache/dev-cpp/doctest-2.4.9
@@ -32970,7 +33062,6 @@
 2303261541 metadata/md5-cache/dev-cpp/highway-1.0.3-r1
 2303261541 metadata/md5-cache/dev-cpp/highway-9999
 2303261522 metadata/md5-cache/dev-cpp/htmlcxx-0.87
-2303261541 metadata/md5-cache/dev-cpp/json11-1.0.0
 2303261541 metadata/md5-cache/dev-cpp/kokkos-3.1.01-r1
 2303261541 metadata/md5-cache/dev-cpp/kokkos-3.7.0
 2303261522 metadata/md5-cache/dev-cpp/libcmis-0.5.2-r2
@@ -33034,7 +33125,6 @@
 2303261541 metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r2
 2303262110 metadata/md5-cache/dev-cpp/kokkos-3.7.1
 2303280010 metadata/md5-cache/dev-cpp/valijson-1.0
-2303310210 metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
 2304020410 metadata/md5-cache/dev-cpp/atkmm-2.28.3
 2304020410 metadata/md5-cache/dev-cpp/glibmm-2.66.5
 2304020410 metadata/md5-cache/dev-cpp/glibmm-2.66.6
@@ -33058,11 +33148,16 @@
 2304150010 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.10.4
 2304150010 metadata/md5-cache/dev-cpp/taskflow-3.4.0
 2304150540 metadata/md5-cache/dev-cpp/tbb-2021.9.0
-2304181440 metadata/md5-cache/dev-cpp/Manifest.gz
 2304181440 metadata/md5-cache/dev-cpp/abseil-cpp-20200923.3
-2304180910 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
 2304180340 metadata/md5-cache/dev-cpp/ctemplate-2.4
 2304181010 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.2
+2304201740 metadata/md5-cache/dev-cpp/Manifest.gz
+2304182110 metadata/md5-cache/dev-cpp/abseil-cpp-20230125.2
+2304200511 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.0
+2304200511 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.1
+2304201410 metadata/md5-cache/dev-cpp/cpp-httplib-0.12.2
+2304181740 metadata/md5-cache/dev-cpp/msgpack-cxx-6.0.0
+2304190840 metadata/md5-cache/dev-cpp/rapidfuzz-cpp-1.11.3
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
 2102261639 metadata/md5-cache/dev-db/lmdb++-1.0.0
 2110231809 metadata/md5-cache/dev-db/pgmemcache-2.3.0
@@ -33109,7 +33204,6 @@
 2303261541 metadata/md5-cache/dev-db/mariadb-connector-c-9999
 2303261541 metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.14
 2303261522 metadata/md5-cache/dev-db/mongodb-4.4.10-r1
-2303261522 metadata/md5-cache/dev-db/mongodb-4.4.8-r1
 2303261522 metadata/md5-cache/dev-db/mongodb-5.0.5-r2
 2303261541 metadata/md5-cache/dev-db/mydumper-0.12.5.3
 2303261541 metadata/md5-cache/dev-db/mydumper-0.12.7.3
@@ -33128,7 +33222,6 @@
 2303261522 metadata/md5-cache/dev-db/oracle-instantclient-21.3.0.0.0
 2303261522 metadata/md5-cache/dev-db/percona-toolkit-3.3.1
 2303261541 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
-2303261541 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
 2303261541 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.26.18
 2303261522 metadata/md5-cache/dev-db/pgFormatter-5.0
 2303261522 metadata/md5-cache/dev-db/pgFormatter-5.1
@@ -33155,7 +33248,6 @@
 2303261522 metadata/md5-cache/dev-db/sqlitestudio-3.3.3
 2303261522 metadata/md5-cache/dev-db/sqlitestudio-3.4.3
 2303261522 metadata/md5-cache/dev-db/sqlmap-1.7.2
-2303261522 metadata/md5-cache/dev-db/sqlmap-1.7.3
 2303261522 metadata/md5-cache/dev-db/sqlmap-9999
 2303261522 metadata/md5-cache/dev-db/tinycdb-0.78
 2303261522 metadata/md5-cache/dev-db/tokyocabinet-1.4.48-r2
@@ -33178,7 +33270,6 @@
 2303301910 metadata/md5-cache/dev-db/postgresql-14.7
 2303301910 metadata/md5-cache/dev-db/postgresql-15.2
 2303311040 metadata/md5-cache/dev-db/redis-7.0.10
-2303311510 metadata/md5-cache/dev-db/mongodb-4.4.8-r2
 2304051141 metadata/md5-cache/dev-db/barman-2.19
 2304051141 metadata/md5-cache/dev-db/barman-3.2.0
 2304051141 metadata/md5-cache/dev-db/mycli-1.26.1
@@ -33201,7 +33292,6 @@
 2304130910 metadata/md5-cache/dev-db/phpmyadmin-5.2.1
 2304151410 metadata/md5-cache/dev-db/unixODBC-2.3.9-r1
 2304152310 metadata/md5-cache/dev-db/pgxnclient-1.3.2
-2304181340 metadata/md5-cache/dev-db/Manifest.gz
 2304180040 metadata/md5-cache/dev-db/citus-11.1.5
 2304180040 metadata/md5-cache/dev-db/citus-11.2.0
 2304180040 metadata/md5-cache/dev-db/etcd-3.3.24
@@ -33211,7 +33301,6 @@
 2304171510 metadata/md5-cache/dev-db/mydumper-0.13.1.2
 2304181140 metadata/md5-cache/dev-db/percona-server-8.0.26.16-r2
 2304181340 metadata/md5-cache/dev-db/percona-toolkit-3.5.1
-2304181140 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
 2304171240 metadata/md5-cache/dev-db/pgbouncer-1.18.0
 2304180040 metadata/md5-cache/dev-db/pglogical-2.4.1
 2304180040 metadata/md5-cache/dev-db/pgmodeler-0.9.2
@@ -33241,6 +33330,12 @@
 2304180040 metadata/md5-cache/dev-db/timescaledb-2.10.1
 2304180040 metadata/md5-cache/dev-db/timescaledb-2.9.2
 2304180040 metadata/md5-cache/dev-db/timescaledb-2.9.3
+2304201840 metadata/md5-cache/dev-db/Manifest.gz
+2304201840 metadata/md5-cache/dev-db/mongodb-4.4.20
+2304201740 metadata/md5-cache/dev-db/mongodb-5.0.16-r1
+2304190440 metadata/md5-cache/dev-db/percona-xtrabackup-2.4.24
+2304190440 metadata/md5-cache/dev-db/percona-xtrabackup-8.0.30.23
+2304190940 metadata/md5-cache/dev-db/sqlmap-1.7.3
 2212070440 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-3.1.423-r4
 2212070440 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.408-r4
 2212070440 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-6.0.402-r2
@@ -33278,8 +33373,6 @@
 2303261522 metadata/md5-cache/dev-embedded/gnusim8085-1.3.7
 2303261522 metadata/md5-cache/dev-embedded/icdprog-0.5
 2303261522 metadata/md5-cache/dev-embedded/libdisasm-0.23
-2303261541 metadata/md5-cache/dev-embedded/libftdi-0.20-r1
-2303261541 metadata/md5-cache/dev-embedded/libftdi-1.5-r4
 2303261522 metadata/md5-cache/dev-embedded/libjaylink-0.3.1
 2303261541 metadata/md5-cache/dev-embedded/mcu8051ide-1.4.10-r1
 2303261522 metadata/md5-cache/dev-embedded/mspdebug-0.25-r1
@@ -33315,8 +33408,6 @@
 2303261522 metadata/md5-cache/dev-embedded/xa-2.3.14
 2303261522 metadata/md5-cache/dev-embedded/zmac-1.3-r1
 2303292340 metadata/md5-cache/dev-embedded/u-boot-tools-2023.01
-2303312310 metadata/md5-cache/dev-embedded/libftdi-0.20-r2
-2303312310 metadata/md5-cache/dev-embedded/libftdi-1.5-r5
 2303312310 metadata/md5-cache/dev-embedded/libftdi-9999
 2304051141 metadata/md5-cache/dev-embedded/esptool-3.3.2
 2304051141 metadata/md5-cache/dev-embedded/esptool-3.3.3
@@ -33330,8 +33421,10 @@
 2304090910 metadata/md5-cache/dev-embedded/platformio-6.1.6-r2
 2304101210 metadata/md5-cache/dev-embedded/sdcc-4.2.0
 2304101140 metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r2
-2304180040 metadata/md5-cache/dev-embedded/Manifest.gz
 2304180040 metadata/md5-cache/dev-embedded/arduino-builder-1.5.4-r1
+2304191440 metadata/md5-cache/dev-embedded/Manifest.gz
+2304191340 metadata/md5-cache/dev-embedded/libftdi-0.20-r2
+2304191440 metadata/md5-cache/dev-embedded/libftdi-1.5-r5
 2303261522 metadata/md5-cache/dev-erlang/Manifest.gz
 2303261522 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2303261522 metadata/md5-cache/dev-erlang/cache_tab-1.0.30
@@ -34014,8 +34107,6 @@
 2303261522 metadata/md5-cache/dev-java/commons-junit4-1.2.17
 2303261522 metadata/md5-cache/dev-java/commons-lang-2.6-r2
 2303261522 metadata/md5-cache/dev-java/commons-lang-3.12.0
-2303261522 metadata/md5-cache/dev-java/commons-logging-1.2-r6
-2303261522 metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
 2303261522 metadata/md5-cache/dev-java/commons-math-3.6.1-r2
 2303261522 metadata/md5-cache/dev-java/commons-net-3.9.0
 2303261522 metadata/md5-cache/dev-java/commons-nullanalysis-1.2.17
@@ -34077,7 +34168,6 @@
 2303261522 metadata/md5-cache/dev-java/icu4j-72.1
 2303261522 metadata/md5-cache/dev-java/injection-api-2.0.1
 2303261522 metadata/md5-cache/dev-java/iso-relax-20050331-r5
-2303261522 metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
 2303261522 metadata/md5-cache/dev-java/istack-commons-runtime-4.1.1-r1
 2303261522 metadata/md5-cache/dev-java/j2objc-annotations-2.8
 2303261522 metadata/md5-cache/dev-java/jackcess-4.0.0
@@ -34127,7 +34217,6 @@
 2303261522 metadata/md5-cache/dev-java/jaxb-api-3.0.1-r1
 2303261522 metadata/md5-cache/dev-java/jaxb-api-4.0.0
 2303261522 metadata/md5-cache/dev-java/jaxb-runtime-4.0.0-r1
-2303261522 metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
 2303261522 metadata/md5-cache/dev-java/jaxb-stax-ex-2.1.0-r1
 2303261522 metadata/md5-cache/dev-java/jaxen-1.2.0-r1
 2303261522 metadata/md5-cache/dev-java/jaxrs-api-2.1.6
@@ -34193,9 +34282,6 @@
 2303261522 metadata/md5-cache/dev-java/lucene-2.4.1-r3
 2303261522 metadata/md5-cache/dev-java/lz4-java-1.8.0-r1
 2303261522 metadata/md5-cache/dev-java/lzmajio-0.95-r3
-2303261522 metadata/md5-cache/dev-java/maven-bin-3.8.7
-2303261522 metadata/md5-cache/dev-java/maven-bin-3.8.8
-2303261522 metadata/md5-cache/dev-java/maven-bin-3.9.0
 2303261522 metadata/md5-cache/dev-java/mchange-commons-0.2.20
 2303261522 metadata/md5-cache/dev-java/memoryfilesystem-2.3.0
 2303261522 metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
@@ -34255,7 +34341,6 @@
 2303261522 metadata/md5-cache/dev-java/slf4j-reload4j-2.0.3
 2303261522 metadata/md5-cache/dev-java/slf4j-simple-2.0.3
 2303261522 metadata/md5-cache/dev-java/snakeyaml-1.33
-2303261522 metadata/md5-cache/dev-java/snakeyaml-2.0
 2303261522 metadata/md5-cache/dev-java/snappy-1.1.7.8-r1
 2303261522 metadata/md5-cache/dev-java/sparsebitset-1.2
 2303261522 metadata/md5-cache/dev-java/stax2-api-4.2.1-r1
@@ -34319,11 +34404,9 @@
 2303302040 metadata/md5-cache/dev-java/javahelp-2.0.05_p20170719-r3
 2303302040 metadata/md5-cache/dev-java/javax-jsp-api-2.0
 2303311610 metadata/md5-cache/dev-java/commons-cli-1.5.0
-2303312040 metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
 2303312040 metadata/md5-cache/dev-java/jaxrs-api-2.1.6-r1
 2303311340 metadata/md5-cache/dev-java/mill-bin-0.10.11
 2303311340 metadata/md5-cache/dev-java/scala-cli-bin-0.2.0
-2303312040 metadata/md5-cache/dev-java/txw2-2.3.8-r1
 2304011940 metadata/md5-cache/dev-java/xmlunit-core-2.9.1
 2304011940 metadata/md5-cache/dev-java/xmlunit-matchers-2.9.1
 2304042310 metadata/md5-cache/dev-java/batik-1.16-r1
@@ -34356,9 +34439,16 @@
 2304160910 metadata/md5-cache/dev-java/open-test-reporting-schema-0.1.0_pre1
 2304160910 metadata/md5-cache/dev-java/picocli-4.6.3-r1
 2304161940 metadata/md5-cache/dev-java/unbescape-1.1.6
-2304181010 metadata/md5-cache/dev-java/Manifest.gz
 2304181010 metadata/md5-cache/dev-java/maven-bin-3.9.1
 2304180540 metadata/md5-cache/dev-java/swt-4.27
+2304201610 metadata/md5-cache/dev-java/Manifest.gz
+2304200810 metadata/md5-cache/dev-java/commons-logging-1.3.0_pre20230319
+2304201610 metadata/md5-cache/dev-java/istack-commons-runtime-3.0.12
+2304201610 metadata/md5-cache/dev-java/jaxb-runtime-2.3.8
+2304201610 metadata/md5-cache/dev-java/jaxb-stax-ex-1.8.3
+2304191440 metadata/md5-cache/dev-java/maven-bin-3.8.8
+2304191240 metadata/md5-cache/dev-java/snakeyaml-2.0
+2304201610 metadata/md5-cache/dev-java/txw2-2.3.8-r1
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -34594,7 +34684,6 @@
 2304151040 metadata/md5-cache/dev-lang/spidermonkey-102.10.0
 2304151210 metadata/md5-cache/dev-lang/spidermonkey-102.9.0
 2304161310 metadata/md5-cache/dev-lang/crystal-1.8.0
-2304181310 metadata/md5-cache/dev-lang/Manifest.gz
 2304180040 metadata/md5-cache/dev-lang/abs-2.6.0
 2304180340 metadata/md5-cache/dev-lang/c-intercal-31.0
 2304170810 metadata/md5-cache/dev-lang/crystal-1.7.3
@@ -34617,6 +34706,9 @@
 2304180340 metadata/md5-cache/dev-lang/mozart-2.0.1
 2304180340 metadata/md5-cache/dev-lang/teyjus-2.1-r2
 2304170410 metadata/md5-cache/dev-lang/typescript-5.0.2
+2304190340 metadata/md5-cache/dev-lang/Manifest.gz
+2304190340 metadata/md5-cache/dev-lang/jsonnet-0.20.0
+2304181910 metadata/md5-cache/dev-lang/vala-0.56.7
 2011160239 metadata/md5-cache/dev-libs/busybee-0.7.0
 2104040139 metadata/md5-cache/dev-libs/c-capnproto-0.3
 2105101009 metadata/md5-cache/dev-libs/cxxtools-3.0
@@ -34764,7 +34856,6 @@
 2303261522 metadata/md5-cache/dev-libs/concurrencykit-0.7.1-r1
 2303261522 metadata/md5-cache/dev-libs/confuse-3.3
 2303261522 metadata/md5-cache/dev-libs/confuse-3.3-r1
-2303261522 metadata/md5-cache/dev-libs/confuse-3.3-r2
 2303261541 metadata/md5-cache/dev-libs/console_bridge-1.0.2
 2303261541 metadata/md5-cache/dev-libs/console_bridge-9999
 2303261541 metadata/md5-cache/dev-libs/cppcodec-0.2
@@ -34889,8 +34980,6 @@
 2303261522 metadata/md5-cache/dev-libs/libcdada-0.3.4-r2
 2303261522 metadata/md5-cache/dev-libs/libcdada-0.3.5
 2303261522 metadata/md5-cache/dev-libs/libcdada-0.4.0
-2303261522 metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
-2303261522 metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
 2303261541 metadata/md5-cache/dev-libs/libcharon-4.13.0
 2303261541 metadata/md5-cache/dev-libs/libchdr-0_p20221129
 2303261522 metadata/md5-cache/dev-libs/libclthreads-2.4.2
@@ -35060,7 +35149,6 @@
 2303261522 metadata/md5-cache/dev-libs/libtomfloat-0.02-r1
 2303261522 metadata/md5-cache/dev-libs/libtommath-1.2.0-r2
 2303261522 metadata/md5-cache/dev-libs/libtompoly-0.04-r2
-2303261522 metadata/md5-cache/dev-libs/libtpms-0.9.4
 2303261522 metadata/md5-cache/dev-libs/libtpms-0.9.6
 2303261522 metadata/md5-cache/dev-libs/libtraceevent-1.6.3
 2303261522 metadata/md5-cache/dev-libs/libtraceevent-1.7.0
@@ -35122,7 +35210,6 @@
 2303261522 metadata/md5-cache/dev-libs/lzo-2.10
 2303261522 metadata/md5-cache/dev-libs/m17n-lib-1.8.0
 2303261522 metadata/md5-cache/dev-libs/maloc-1.5-r1
-2303261541 metadata/md5-cache/dev-libs/mdns-1.4.2
 2303261541 metadata/md5-cache/dev-libs/metee-3.1.5
 2303261541 metadata/md5-cache/dev-libs/mimalloc-2.0.9
 2303261522 metadata/md5-cache/dev-libs/mimetic-0.9.8
@@ -35227,7 +35314,6 @@
 2303261541 metadata/md5-cache/dev-libs/rocr-runtime-5.3.3-r1
 2303261541 metadata/md5-cache/dev-libs/rocr-runtime-5.4.3-r1
 2303261541 metadata/md5-cache/dev-libs/s2n-1.0.0
-2303261541 metadata/md5-cache/dev-libs/sdformat-9.8.0
 2303261522 metadata/md5-cache/dev-libs/serd-0.30.16
 2303261522 metadata/md5-cache/dev-libs/serdisplib-2.02-r2
 2303261522 metadata/md5-cache/dev-libs/shhopt-1.1.7-r3
@@ -35349,18 +35435,12 @@
 2303290513 metadata/md5-cache/dev-libs/libgpiod-1.6.3-r4
 2303290513 metadata/md5-cache/dev-libs/libugpio-0.0.7-r1
 2303271510 metadata/md5-cache/dev-libs/libzia-4.42
-2303290513 metadata/md5-cache/dev-libs/openssl-1.1.1s
-2303290513 metadata/md5-cache/dev-libs/openssl-3.0.8-r1
-2303290513 metadata/md5-cache/dev-libs/openssl-3.0.8-r2
-2303290513 metadata/md5-cache/dev-libs/openssl-3.1.0
-2303290513 metadata/md5-cache/dev-libs/openssl-3.1.0-r1
 2303290513 metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
 2303290513 metadata/md5-cache/dev-libs/roct-thunk-interface-5.1.3
 2303290513 metadata/md5-cache/dev-libs/roct-thunk-interface-5.3.3
 2303290513 metadata/md5-cache/dev-libs/roct-thunk-interface-5.4.3
 2303300840 metadata/md5-cache/dev-libs/skalibs-2.13.1.0
 2303301710 metadata/md5-cache/dev-libs/libfastjson-0.99.9.1
-2303302040 metadata/md5-cache/dev-libs/libtpms-0.9.5
 2303301940 metadata/md5-cache/dev-libs/openpace-1.1.2
 2303301940 metadata/md5-cache/dev-libs/opensc-0.23.0
 2303302140 metadata/md5-cache/dev-libs/xapian-1.4.21-r1
@@ -35394,7 +35474,6 @@
 2304020410 metadata/md5-cache/dev-libs/gobject-introspection-common-1.76.1
 2304020410 metadata/md5-cache/dev-libs/gom-0.4
 2304031040 metadata/md5-cache/dev-libs/imath-3.1.7
-2304032240 metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18
 2304020410 metadata/md5-cache/dev-libs/json-glib-1.6.6-r1
 2304051141 metadata/md5-cache/dev-libs/json-parser-1.1.0_p20211208
 2304020410 metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
@@ -35450,7 +35529,6 @@
 2304020410 metadata/md5-cache/dev-libs/vala-common-0.56.4
 2304020410 metadata/md5-cache/dev-libs/vala-common-0.56.5
 2304042210 metadata/md5-cache/dev-libs/vala-common-0.56.6
-2304021310 metadata/md5-cache/dev-libs/xapian-1.4.22
 2304020610 metadata/md5-cache/dev-libs/xerces-c-3.2.4
 2304020610 metadata/md5-cache/dev-libs/xerces-c-9999
 2304061910 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-20.40.1147286
@@ -35471,7 +35549,6 @@
 2304092310 metadata/md5-cache/dev-libs/cpuinfo-2022.08.19
 2304092310 metadata/md5-cache/dev-libs/cudnn-frontend-0.7.3
 2304072140 metadata/md5-cache/dev-libs/gumbo-0.10.1
-2304092240 metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.11
 2304092240 metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20221216
 2304092240 metadata/md5-cache/dev-libs/intel-vc-intrinsics-0.12.1
 2304081740 metadata/md5-cache/dev-libs/kasync-0.3.0
@@ -35502,9 +35579,7 @@
 2304090540 metadata/md5-cache/dev-libs/wayland-9999
 2304101210 metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
 2304101210 metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
-2304101210 metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
 2304102210 metadata/md5-cache/dev-libs/intel-compute-runtime-23.09.25812.14
-2304102210 metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
 2304102210 metadata/md5-cache/dev-libs/level-zero-1.10.0
 2304110740 metadata/md5-cache/dev-libs/libsecp256k1-0.3.1
 2304102140 metadata/md5-cache/dev-libs/simdjson-3.1.7
@@ -35518,20 +35593,9 @@
 2304120910 metadata/md5-cache/dev-libs/opencl-icd-loader-2023.02.06
 2304140410 metadata/md5-cache/dev-libs/hyphen-2.8.8-r2
 2304140710 metadata/md5-cache/dev-libs/keystone-0.9.2-r1
-2304142240 metadata/md5-cache/dev-libs/libclc-14.0.6
-2304142240 metadata/md5-cache/dev-libs/libclc-15.0.7
-2304142240 metadata/md5-cache/dev-libs/libclc-16.0.1
-2304142240 metadata/md5-cache/dev-libs/libclc-16.0.2.9999
-2304142240 metadata/md5-cache/dev-libs/libclc-17.0.0.9999
-2304142240 metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325
-2304142240 metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414
 2304130910 metadata/md5-cache/dev-libs/libgit2-1.6.4
 2304140110 metadata/md5-cache/dev-libs/libgit2-glib-1.1.0
 2304130710 metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
-2304130710 metadata/md5-cache/dev-libs/openssl-1.1.1t-r2
-2304130710 metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
-2304130710 metadata/md5-cache/dev-libs/openssl-3.0.8-r3
-2304130710 metadata/md5-cache/dev-libs/openssl-3.1.0-r2
 2304122340 metadata/md5-cache/dev-libs/sleef-3.5.1-r1
 2304142310 metadata/md5-cache/dev-libs/rinutils-0.10.1
 2304151540 metadata/md5-cache/dev-libs/skalibs-2.13.1.1
@@ -35546,10 +35610,8 @@
 2304161540 metadata/md5-cache/dev-libs/ntl-11.5.1-r2
 2304161910 metadata/md5-cache/dev-libs/nwjs-0.75.0
 2304161840 metadata/md5-cache/dev-libs/tree-sitter-0.20.8
-2304181340 metadata/md5-cache/dev-libs/Manifest.gz
 2304170410 metadata/md5-cache/dev-libs/apr-1.7.4
 2304180540 metadata/md5-cache/dev-libs/icu-73.1-r1
-2304172110 metadata/md5-cache/dev-libs/ktextaddons-1.1.1-r1
 2304171940 metadata/md5-cache/dev-libs/libfastjson-1.2304.0
 2304171510 metadata/md5-cache/dev-libs/libmemcached-awesome-1.1.4
 2304180140 metadata/md5-cache/dev-libs/libqtxdg-3.11.0
@@ -35567,6 +35629,34 @@
 2304181340 metadata/md5-cache/dev-libs/rocksdb-6.15.5-r1
 2304181340 metadata/md5-cache/dev-libs/rocksdb-6.17.3-r1
 2304170410 metadata/md5-cache/dev-libs/xmlsec-1.3.0-r1
+2304202010 metadata/md5-cache/dev-libs/Manifest.gz
+2304190840 metadata/md5-cache/dev-libs/confuse-3.3-r2
+2304190010 metadata/md5-cache/dev-libs/intel-compute-runtime-23.05.25593.18
+2304190010 metadata/md5-cache/dev-libs/intel-compute-runtime-23.13.26032.8
+2304190010 metadata/md5-cache/dev-libs/intel-metrics-discovery-1.12.164
+2304190010 metadata/md5-cache/dev-libs/intel-metrics-library-0_pre20230417
+2304182040 metadata/md5-cache/dev-libs/ktextaddons-1.2.0
+2304201410 metadata/md5-cache/dev-libs/libcdio-2.1.0-r1
+2304201410 metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.1
+2304191040 metadata/md5-cache/dev-libs/libchdr-0_p20230230
+2304192310 metadata/md5-cache/dev-libs/libclc-14.0.6
+2304192310 metadata/md5-cache/dev-libs/libclc-15.0.7
+2304192310 metadata/md5-cache/dev-libs/libclc-16.0.1
+2304192310 metadata/md5-cache/dev-libs/libclc-16.0.2
+2304192310 metadata/md5-cache/dev-libs/libclc-16.0.3.9999
+2304192310 metadata/md5-cache/dev-libs/libclc-17.0.0.9999
+2304192310 metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230325
+2304192310 metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230414
+2304190040 metadata/md5-cache/dev-libs/libdispatch-5.8
+2304201410 metadata/md5-cache/dev-libs/mdns-1.4.2
+2304191440 metadata/md5-cache/dev-libs/openssl-1.1.1t-r3
+2304202010 metadata/md5-cache/dev-libs/openssl-3.0.8-r4
+2304202010 metadata/md5-cache/dev-libs/openssl-3.1.0-r3
+2304181640 metadata/md5-cache/dev-libs/sdformat-9.10.0
+2304181910 metadata/md5-cache/dev-libs/vala-common-0.56.7
+2304201610 metadata/md5-cache/dev-libs/xapian-1.4.22
+2304201610 metadata/md5-cache/dev-libs/xapian-bindings-1.4.22
+2304190940 metadata/md5-cache/dev-libs/xmlrpc-c-1.54.06
 2303180118 metadata/md5-cache/dev-lisp/alexandria-1.4
 2303180118 metadata/md5-cache/dev-lisp/asdf-3.3.5
 2303180118 metadata/md5-cache/dev-lisp/uiop-3.3.5
@@ -35623,13 +35713,10 @@
 2303261522 metadata/md5-cache/dev-lua/luaexpat-1.5.1
 2303261522 metadata/md5-cache/dev-lua/luafilesystem-1.8.0-r101
 2303261522 metadata/md5-cache/dev-lua/luajson-1.3.4
-2303261522 metadata/md5-cache/dev-lua/lualdap-1.3.0-r2
-2303261522 metadata/md5-cache/dev-lua/lualdap-1.3.1
 2303261522 metadata/md5-cache/dev-lua/luaossl-20220711
 2303261522 metadata/md5-cache/dev-lua/luaposix-36.1
 2303261522 metadata/md5-cache/dev-lua/luarocks-3.9.2
 2303261522 metadata/md5-cache/dev-lua/luasec-1.2.0
-2303261522 metadata/md5-cache/dev-lua/luasec-1.3.1
 2303261522 metadata/md5-cache/dev-lua/luasocket-3.1.0
 2303261522 metadata/md5-cache/dev-lua/luassert-1.9.0
 2303261522 metadata/md5-cache/dev-lua/luasystem-0.2.1_p0-r1
@@ -35637,7 +35724,6 @@
 2303261522 metadata/md5-cache/dev-lua/md5-1.3-r1
 2303261522 metadata/md5-cache/dev-lua/mediator_lua-1.1.2_p0-r1
 2303261522 metadata/md5-cache/dev-lua/messagepack-0.5.2_p20201025-r100
-2303261522 metadata/md5-cache/dev-lua/mpack-1.0.10
 2303261522 metadata/md5-cache/dev-lua/mpack-1.0.9-r1
 2303261522 metadata/md5-cache/dev-lua/penlight-1.13.1
 2303261522 metadata/md5-cache/dev-lua/readline-3.2
@@ -35646,8 +35732,11 @@
 2304061910 metadata/md5-cache/dev-lua/luv-1.36.0.0
 2304061910 metadata/md5-cache/dev-lua/luv-1.43.0.0
 2304081710 metadata/md5-cache/dev-lua/luv-1.44.2.0
-2304102210 metadata/md5-cache/dev-lua/Manifest.gz
 2304102210 metadata/md5-cache/dev-lua/readline-3.3
+2304200810 metadata/md5-cache/dev-lua/Manifest.gz
+2304190440 metadata/md5-cache/dev-lua/lualdap-1.3.1
+2304200810 metadata/md5-cache/dev-lua/luasec-1.3.1
+2304200810 metadata/md5-cache/dev-lua/mpack-1.0.10
 2104210539 metadata/md5-cache/dev-ml/ocaml-doc-4.04
 2112052139 metadata/md5-cache/dev-ml/ocaml-doc-4.05
 2203040040 metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
@@ -35733,7 +35822,6 @@
 2303261522 metadata/md5-cache/dev-ml/async_extra-0.14.0
 2303261522 metadata/md5-cache/dev-ml/async_extra-0.15.0
 2303261522 metadata/md5-cache/dev-ml/async_kernel-0.14.0
-2303261522 metadata/md5-cache/dev-ml/async_kernel-0.15.0
 2303261522 metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
 2303261522 metadata/md5-cache/dev-ml/async_rpc_kernel-0.15.0
 2303261522 metadata/md5-cache/dev-ml/async_unix-0.14.0
@@ -35746,7 +35834,6 @@
 2303261522 metadata/md5-cache/dev-ml/base-0.15.0-r3
 2303261522 metadata/md5-cache/dev-ml/base-0.15.1-r1
 2303261522 metadata/md5-cache/dev-ml/base_bigstring-0.14.0
-2303261522 metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
 2303261522 metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
 2303261522 metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r2
 2303261522 metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
@@ -35765,7 +35852,6 @@
 2303261522 metadata/md5-cache/dev-ml/camlidl-1.11
 2303261522 metadata/md5-cache/dev-ml/camlp-streams-5.0.1
 2303261522 metadata/md5-cache/dev-ml/camomile-1.0.2
-2303261522 metadata/md5-cache/dev-ml/charinfo_width-1.1.0
 2303261522 metadata/md5-cache/dev-ml/cinaps-0.14.0
 2303261522 metadata/md5-cache/dev-ml/cinaps-0.15.0
 2303261522 metadata/md5-cache/dev-ml/cinaps-0.15.1
@@ -35773,12 +35859,10 @@
 2303261522 metadata/md5-cache/dev-ml/core-0.14.0-r4
 2303261522 metadata/md5-cache/dev-ml/core-0.14.1-r1
 2303261522 metadata/md5-cache/dev-ml/core-0.15.0
-2303261522 metadata/md5-cache/dev-ml/core-0.15.1-r1
 2303261522 metadata/md5-cache/dev-ml/core_bench-0.14.0
 2303261522 metadata/md5-cache/dev-ml/core_bench-0.15.0
 2303261522 metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
 2303261522 metadata/md5-cache/dev-ml/core_kernel-0.14.2-r1
-2303261522 metadata/md5-cache/dev-ml/core_kernel-0.15.0
 2303261522 metadata/md5-cache/dev-ml/core_unix-0.15.0
 2303261522 metadata/md5-cache/dev-ml/core_unix-0.15.2-r1
 2303261522 metadata/md5-cache/dev-ml/cppo-1.6.7-r1
@@ -35837,7 +35921,6 @@
 2303261522 metadata/md5-cache/dev-ml/graphics-5.1.1-r1
 2303261522 metadata/md5-cache/dev-ml/graphics-5.1.2
 2303261522 metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
-2303261522 metadata/md5-cache/dev-ml/int_repr-0.15.0
 2303261522 metadata/md5-cache/dev-ml/integers-0.5.1
 2303261522 metadata/md5-cache/dev-ml/integers-0.7.0
 2303261522 metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
@@ -35891,9 +35974,6 @@
 2303261522 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3-r1
 2303261522 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.4-r1
 2303261522 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
-2303261522 metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
-2303261522 metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
-2303261522 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
 2303261522 metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
 2303261522 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0-r1
 2303261522 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
@@ -36169,20 +36249,12 @@
 2304091610 metadata/md5-cache/dev-ml/re-1.10.4-r2
 2304112010 metadata/md5-cache/dev-ml/seq-0.3-r1
 2304112140 metadata/md5-cache/dev-ml/seq-0.3.1-r1
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2.9999
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325
-2304142240 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414
 2304161210 metadata/md5-cache/dev-ml/dune-build-info-3.7.1
 2304161210 metadata/md5-cache/dev-ml/dune-configurator-3.7.1
 2304161210 metadata/md5-cache/dev-ml/dune-private-libs-3.7.1
 2304161210 metadata/md5-cache/dev-ml/dyn-3.7.1
 2304161210 metadata/md5-cache/dev-ml/ordering-3.7.1
 2304161210 metadata/md5-cache/dev-ml/stdune-3.7.1
-2304180540 metadata/md5-cache/dev-ml/Manifest.gz
 2304171210 metadata/md5-cache/dev-ml/alcotest-1.7.0
 2304180540 metadata/md5-cache/dev-ml/camomile-2.0.0
 2304180340 metadata/md5-cache/dev-ml/dune-2.9.3-r3
@@ -36202,6 +36274,24 @@
 2304180340 metadata/md5-cache/dev-ml/utop-2.9.0-r1
 2304180340 metadata/md5-cache/dev-ml/utop-2.9.1-r1
 2304180340 metadata/md5-cache/dev-ml/utop-2.9.2
+2304200010 metadata/md5-cache/dev-ml/Manifest.gz
+2304200010 metadata/md5-cache/dev-ml/async_kernel-0.15.0
+2304200010 metadata/md5-cache/dev-ml/base_bigstring-0.15.0-r1
+2304190110 metadata/md5-cache/dev-ml/charinfo_width-1.1.0-r1
+2304200010 metadata/md5-cache/dev-ml/core-0.15.1-r1
+2304200010 metadata/md5-cache/dev-ml/core_kernel-0.15.0
+2304191010 metadata/md5-cache/dev-ml/int_repr-0.15.0
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.1
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.2
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-16.0.3.9999
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0.9999
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230325
+2304192310 metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230414
+2304190110 metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2-r1
+2304190110 metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2-r1
+2304191910 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r2
 2303261522 metadata/md5-cache/dev-perl/Ace-1.920.0-r6
 2303261522 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2303261522 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
@@ -36774,7 +36864,6 @@
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-Config-0.8.0-r1
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.210.0
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-CppGuess-0.230.0
-2303261522 metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-F77-1.260.0
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-HasCompiler-0.23.0
 2303261522 metadata/md5-cache/dev-perl/ExtUtils-Helpers-0.26.0-r1
@@ -37103,7 +37192,6 @@
 2303261522 metadata/md5-cache/dev-perl/Locale-PO-0.270.0-r1
 2303261522 metadata/md5-cache/dev-perl/Locale-gettext-1.70.0-r1
 2303261522 metadata/md5-cache/dev-perl/LockFile-Simple-0.208.0-r3
-2303261522 metadata/md5-cache/dev-perl/Log-Agent-1.5.0
 2303261522 metadata/md5-cache/dev-perl/Log-Any-1.709.0
 2303261522 metadata/md5-cache/dev-perl/Log-Any-1.710.0
 2303261522 metadata/md5-cache/dev-perl/Log-Dispatch-2.700.0
@@ -38016,7 +38104,6 @@
 2303261522 metadata/md5-cache/dev-perl/constant-defer-6.0.0-r1
 2303261522 metadata/md5-cache/dev-perl/enum-1.120.0
 2303261522 metadata/md5-cache/dev-perl/forks-0.360.0-r2
-2303261522 metadata/md5-cache/dev-perl/glib-perl-1.329.300
 2303261522 metadata/md5-cache/dev-perl/gnome2-wnck-0.180.0
 2303261522 metadata/md5-cache/dev-perl/go-perl-0.150.0
 2303261522 metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r2
@@ -38086,8 +38173,11 @@
 2304142310 metadata/md5-cache/dev-perl/Net-Whois-IP-1.190.0-r2
 2304151940 metadata/md5-cache/dev-perl/String-Random-0.320.0
 2304180340 metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
-2304180340 metadata/md5-cache/dev-perl/Manifest.gz
 2304180340 metadata/md5-cache/dev-perl/Perl-Critic-1.140.0-r1
+2304201410 metadata/md5-cache/dev-perl/ExtUtils-Depends-0.800.100
+2304201410 metadata/md5-cache/dev-perl/Log-Agent-1.5.0
+2304201410 metadata/md5-cache/dev-perl/Manifest.gz
+2304201410 metadata/md5-cache/dev-perl/glib-perl-1.329.300
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2101072209 metadata/md5-cache/dev-php/File_Iterator-2.0.2-r1
 2108131009 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -38471,8 +38561,9 @@
 2303261522 metadata/md5-cache/dev-php/xdebug-client-2.9.6
 2303261522 metadata/md5-cache/dev-php/xdebug-client-2.9.8
 2303261522 metadata/md5-cache/dev-php/xhprof-2.3.5
-2304040512 metadata/md5-cache/dev-php/Manifest.gz
 2304040512 metadata/md5-cache/dev-php/smarty-4.3.1
+2304190740 metadata/md5-cache/dev-php/Manifest.gz
+2304190740 metadata/md5-cache/dev-php/twig-1.44.7
 2104060140 metadata/md5-cache/dev-python/python-docs-2.7.18
 2210072340 metadata/md5-cache/dev-python/ensurepip-wheels-100
 2211191140 metadata/md5-cache/dev-python/ensurepip-pip-22.3.1
@@ -38543,7 +38634,6 @@
 2304051141 metadata/md5-cache/dev-python/PyQt-builder-1.14.1
 2304051141 metadata/md5-cache/dev-python/PyQt5-sip-12.11.0
 2304051141 metadata/md5-cache/dev-python/PyQt5-sip-12.11.1
-2304051141 metadata/md5-cache/dev-python/PyQt6-6.4.2
 2304051141 metadata/md5-cache/dev-python/PyQt6-WebEngine-6.4.0
 2304051141 metadata/md5-cache/dev-python/PyQt6-sip-13.4.1
 2304051141 metadata/md5-cache/dev-python/PyRSS2Gen-1.1-r2
@@ -38718,7 +38808,6 @@
 2304051141 metadata/md5-cache/dev-python/click-log-0.4.0
 2304051141 metadata/md5-cache/dev-python/click-plugins-1.1.1-r1
 2304051141 metadata/md5-cache/dev-python/click-threading-0.5.0-r1
-2304051141 metadata/md5-cache/dev-python/cliff-4.2.0
 2304051141 metadata/md5-cache/dev-python/clikit-0.6.2-r1
 2304051141 metadata/md5-cache/dev-python/clint-0.5.1-r4
 2304051141 metadata/md5-cache/dev-python/cloudpickle-2.2.1
@@ -38762,17 +38851,13 @@
 2304051141 metadata/md5-cache/dev-python/css-parser-1.0.8
 2304051141 metadata/md5-cache/dev-python/cssselect-1.2.0
 2304051141 metadata/md5-cache/dev-python/cssselect2-0.7.0
-2304051141 metadata/md5-cache/dev-python/cssutils-2.6.0
 2304051141 metadata/md5-cache/dev-python/csvkit-1.1.1
 2304051141 metadata/md5-cache/dev-python/curtsies-0.4.1-r1
 2304051141 metadata/md5-cache/dev-python/cwcwidth-0.1.8
-2304051141 metadata/md5-cache/dev-python/cx_Freeze-6.13.1
-2304051141 metadata/md5-cache/dev-python/cx_Freeze-6.14.5
 2304051141 metadata/md5-cache/dev-python/cycler-0.11.0-r1
 2304051141 metadata/md5-cache/dev-python/cython-3.0.0_beta2
 2304051141 metadata/md5-cache/dev-python/cython-test-exception-raiser-1.0.2-r1
 2304051141 metadata/md5-cache/dev-python/daemonize-2.5.0-r1
-2304051210 metadata/md5-cache/dev-python/dask-2023.3.2
 2304051141 metadata/md5-cache/dev-python/dbfread-2.0.7-r1
 2304051141 metadata/md5-cache/dev-python/dbus-next-0.2.3-r1
 2304051141 metadata/md5-cache/dev-python/ddt-1.6.0
@@ -38825,7 +38910,6 @@
 2304051141 metadata/md5-cache/dev-python/django_polymorphic-3.1-r1
 2304051141 metadata/md5-cache/dev-python/djangorestframework-3.14.0
 2304051141 metadata/md5-cache/dev-python/dkimpy-1.1.1
-2304051141 metadata/md5-cache/dev-python/dns-lexicon-3.11.7
 2304051141 metadata/md5-cache/dev-python/dnspython-2.3.0
 2304051141 metadata/md5-cache/dev-python/doc8-1.1.1
 2304051141 metadata/md5-cache/dev-python/docker-py-5.0.3
@@ -38898,7 +38982,6 @@
 2304051141 metadata/md5-cache/dev-python/flake8-6.0.0
 2304051141 metadata/md5-cache/dev-python/flake8-polyfill-1.0.2-r1
 2304051141 metadata/md5-cache/dev-python/flaky-3.7.0-r4
-2304051141 metadata/md5-cache/dev-python/flask-2.2.3
 2304051141 metadata/md5-cache/dev-python/flask-api-3.0-r1
 2304060640 metadata/md5-cache/dev-python/flask-babel-3.0.1-r2
 2304051141 metadata/md5-cache/dev-python/flask-compress-1.13
@@ -38978,7 +39061,6 @@
 2304051141 metadata/md5-cache/dev-python/hatch-vcs-0.3.0
 2304051141 metadata/md5-cache/dev-python/hatchling-1.13.0
 2304051141 metadata/md5-cache/dev-python/hcloud-python-1.18.2
-2304051141 metadata/md5-cache/dev-python/helpdev-0.7.1-r1
 2304051141 metadata/md5-cache/dev-python/hidapi-0.13.1
 2304051141 metadata/md5-cache/dev-python/hiredis-2.2.2-r1
 2304051141 metadata/md5-cache/dev-python/hpack-4.0.0-r1
@@ -39000,11 +39082,6 @@
 2304051141 metadata/md5-cache/dev-python/hvac-1.1.0
 2304051141 metadata/md5-cache/dev-python/hyperframe-6.0.1-r1
 2304051141 metadata/md5-cache/dev-python/hyperlink-21.0.0-r1
-2304051141 metadata/md5-cache/dev-python/hypothesis-6.68.2
-2304051141 metadata/md5-cache/dev-python/hypothesis-6.69.0
-2304051141 metadata/md5-cache/dev-python/hypothesis-6.70.0
-2304051141 metadata/md5-cache/dev-python/hypothesis-6.70.1
-2304051141 metadata/md5-cache/dev-python/hypothesis-6.70.2
 2304051141 metadata/md5-cache/dev-python/icalendar-5.0.4
 2304051141 metadata/md5-cache/dev-python/identify-2.5.22
 2304051141 metadata/md5-cache/dev-python/idna-3.4
@@ -39016,7 +39093,6 @@
 2304051141 metadata/md5-cache/dev-python/imapclient-2.3.1
 2304051141 metadata/md5-cache/dev-python/iminuit-2.19.0
 2304051141 metadata/md5-cache/dev-python/immutables-0.19
-2304051141 metadata/md5-cache/dev-python/importlib_resources-5.12.0
 2304051141 metadata/md5-cache/dev-python/incremental-22.10.0
 2304051141 metadata/md5-cache/dev-python/indexed_gzip-1.7.1
 2304051141 metadata/md5-cache/dev-python/inflect-6.0.2
@@ -39089,12 +39165,10 @@
 2304051141 metadata/md5-cache/dev-python/jsonref-1.1.0
 2304051141 metadata/md5-cache/dev-python/jsonrpclib-0.4.3.2
 2304051141 metadata/md5-cache/dev-python/jsonrpclib-9999
-2304051141 metadata/md5-cache/dev-python/jsonschema-4.17.3
 2304051141 metadata/md5-cache/dev-python/jsonxs-0.6-r1
 2304051141 metadata/md5-cache/dev-python/junit-xml-1.9
 2304051141 metadata/md5-cache/dev-python/jupyter-1.0.0-r4
 2304051141 metadata/md5-cache/dev-python/jupyter-core-5.3.0
-2304051141 metadata/md5-cache/dev-python/jupyter-lsp-2.0.1
 2304051141 metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.2
 2304051141 metadata/md5-cache/dev-python/jupyter-server-terminals-0.4.4
 2304051141 metadata/md5-cache/dev-python/jupyter_events-0.5.0
@@ -39109,7 +39183,6 @@
 2304051141 metadata/md5-cache/dev-python/kaitaistruct-0.10
 2304051141 metadata/md5-cache/dev-python/kaptan-0.5.12-r2
 2304051141 metadata/md5-cache/dev-python/kconfiglib-14.1.0-r1
-2304051141 metadata/md5-cache/dev-python/keyring-23.13.1-r1
 2304051141 metadata/md5-cache/dev-python/keyrings-alt-4.2.0
 2304051141 metadata/md5-cache/dev-python/keystoneauth1-5.1.2
 2304051141 metadata/md5-cache/dev-python/kgb-7.1.1
@@ -39158,9 +39231,6 @@
 2304051141 metadata/md5-cache/dev-python/manuel-1.12.4
 2304051740 metadata/md5-cache/dev-python/mapbox-vector-tile-2.0.1
 2304051141 metadata/md5-cache/dev-python/mapbox_earcut-1.0.1
-2304051141 metadata/md5-cache/dev-python/markdown-3.3.7
-2304051141 metadata/md5-cache/dev-python/markdown-3.4.1
-2304051141 metadata/md5-cache/dev-python/markdown-3.4.3
 2304051141 metadata/md5-cache/dev-python/markdown-it-py-2.2.0
 2304051141 metadata/md5-cache/dev-python/markdown2-2.4.8
 2304051141 metadata/md5-cache/dev-python/markups-4.0.0
@@ -39171,10 +39241,7 @@
 2304051141 metadata/md5-cache/dev-python/matplotlib-3.6.1
 2304051141 metadata/md5-cache/dev-python/matplotlib-3.6.2
 2304051141 metadata/md5-cache/dev-python/matplotlib-3.6.3
-2304051141 metadata/md5-cache/dev-python/matplotlib-3.7.0
-2304051141 metadata/md5-cache/dev-python/matplotlib-3.7.1
 2304051141 metadata/md5-cache/dev-python/matplotlib-inline-0.1.6
-2304051141 metadata/md5-cache/dev-python/matrix-common-1.3.0
 2304051141 metadata/md5-cache/dev-python/matterhook-0.2-r2
 2304051141 metadata/md5-cache/dev-python/mccabe-0.7.0
 2304051141 metadata/md5-cache/dev-python/mdit-py-plugins-0.3.5
@@ -39220,9 +39287,6 @@
 2304051141 metadata/md5-cache/dev-python/nagiosplugin-1.3.3
 2304051141 metadata/md5-cache/dev-python/natsort-8.3.1
 2304020410 metadata/md5-cache/dev-python/nautilus-python-4.0
-2304051141 metadata/md5-cache/dev-python/nbconvert-7.2.10-r1
-2304051141 metadata/md5-cache/dev-python/nbconvert-7.2.9
-2304060710 metadata/md5-cache/dev-python/nbconvert-7.3.0
 2304051141 metadata/md5-cache/dev-python/nbformat-5.7.3
 2304051141 metadata/md5-cache/dev-python/nbformat-5.8.0
 2304051141 metadata/md5-cache/dev-python/nbsphinx-0.8.12
@@ -39248,7 +39312,6 @@
 2304051141 metadata/md5-cache/dev-python/nototools-0.2.17
 2304051141 metadata/md5-cache/dev-python/nptyping-2.3.1
 2304051141 metadata/md5-cache/dev-python/nptyping-2.5.0
-2304051141 metadata/md5-cache/dev-python/nspektr-0.4.0
 2304051141 metadata/md5-cache/dev-python/ntlm-auth-1.5.0
 2304051141 metadata/md5-cache/dev-python/ntplib-0.4.0-r1
 2304051141 metadata/md5-cache/dev-python/numexpr-2.8.4
@@ -39267,14 +39330,12 @@
 2304051141 metadata/md5-cache/dev-python/openapi-spec-validator-0.5.5
 2304051141 metadata/md5-cache/dev-python/openapi-spec-validator-0.5.6
 2304051141 metadata/md5-cache/dev-python/openstackdocstheme-3.1.0
-2304051141 metadata/md5-cache/dev-python/openstacksdk-1.0.1
 2304051141 metadata/md5-cache/dev-python/opt-einsum-3.3.0-r1
 2304051141 metadata/md5-cache/dev-python/ordered-set-4.1.0
 2304051141 metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
 2304051141 metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
 2304051141 metadata/md5-cache/dev-python/osc-lib-2.7.0
 2304051141 metadata/md5-cache/dev-python/oslo-concurrency-5.1.1
-2304051141 metadata/md5-cache/dev-python/oslo-config-9.1.1
 2304051141 metadata/md5-cache/dev-python/oslo-context-5.1.0
 2304051141 metadata/md5-cache/dev-python/oslo-context-5.1.1
 2304051141 metadata/md5-cache/dev-python/oslo-i18n-6.0.0
@@ -39348,7 +39409,6 @@
 2304051141 metadata/md5-cache/dev-python/pillow-9.5.0
 2304051141 metadata/md5-cache/dev-python/pip-22.3.1
 2304051141 metadata/md5-cache/dev-python/pip-23.0.1
-2304051141 metadata/md5-cache/dev-python/pip-run-10.0.5-r1
 2304051141 metadata/md5-cache/dev-python/pipenv-2022.12.19
 2304051141 metadata/md5-cache/dev-python/pivy-0.6.8
 2304051141 metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
@@ -39410,8 +39470,6 @@
 2304051141 metadata/md5-cache/dev-python/pyDes-2.0.1
 2304051141 metadata/md5-cache/dev-python/pyGPG-0.2-r1
 2304051141 metadata/md5-cache/dev-python/pyGPG-9999
-2304051141 metadata/md5-cache/dev-python/pyacoustid-1.2.2
-2304051141 metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1
 2304051141 metadata/md5-cache/dev-python/pyaes-1.6.1-r3
 2304051141 metadata/md5-cache/dev-python/pyalsa-1.2.7
 2304051141 metadata/md5-cache/dev-python/pyamg-4.2.3
@@ -39427,9 +39485,6 @@
 2304051141 metadata/md5-cache/dev-python/pycares-4.3.0
 2304051141 metadata/md5-cache/dev-python/pycdio-2.1.1-r1
 2304051141 metadata/md5-cache/dev-python/pychm-0.8.6-r1
-2304051141 metadata/md5-cache/dev-python/pychromecast-13.0.4
-2304051141 metadata/md5-cache/dev-python/pychromecast-13.0.6
-2304051141 metadata/md5-cache/dev-python/pychromecast-13.0.7
 2304051141 metadata/md5-cache/dev-python/pychroot-0.10.4
 2304051141 metadata/md5-cache/dev-python/pychroot-9999
 2304051141 metadata/md5-cache/dev-python/pyclipper-1.3.0_p4
@@ -39846,7 +39901,6 @@
 2304051141 metadata/md5-cache/dev-python/serverfiles-0.3.1-r1
 2304051141 metadata/md5-cache/dev-python/service_identity-21.1.0-r1
 2304051141 metadata/md5-cache/dev-python/setproctitle-1.3.2
-2304051141 metadata/md5-cache/dev-python/setuptools-67.6.1
 2304051141 metadata/md5-cache/dev-python/setuptools-git-1.2-r3
 2304051141 metadata/md5-cache/dev-python/setuptools-rust-1.5.2
 2304051141 metadata/md5-cache/dev-python/setuptools-scm-7.1.0
@@ -39857,7 +39911,6 @@
 2304051141 metadata/md5-cache/dev-python/sh-2.0.3
 2304051141 metadata/md5-cache/dev-python/shapely-2.0.1
 2304051141 metadata/md5-cache/dev-python/signature_dispatch-1.0.1
-2304051141 metadata/md5-cache/dev-python/signedjson-1.1.4
 2304051141 metadata/md5-cache/dev-python/simber-0.2.6
 2304051141 metadata/md5-cache/dev-python/simpervisor-0.4-r1
 2304051141 metadata/md5-cache/dev-python/simplebayes-1.5.8
@@ -39884,9 +39937,6 @@
 2304051141 metadata/md5-cache/dev-python/sortedcontainers-2.4.0-r1
 2304051141 metadata/md5-cache/dev-python/soupsieve-2.4
 2304051141 metadata/md5-cache/dev-python/speg-0.3_p20180819-r1
-2304051141 metadata/md5-cache/dev-python/sphinx-4.5.0-r1
-2304051141 metadata/md5-cache/dev-python/sphinx-5.3.0
-2304051141 metadata/md5-cache/dev-python/sphinx-6.1.3
 2304051141 metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6-r1
 2304051141 metadata/md5-cache/dev-python/sphinx-autoapi-2.1.0
 2304051141 metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.22
@@ -39905,14 +39955,12 @@
 2304051141 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2
 2304051141 metadata/md5-cache/dev-python/sphinx_ansible_theme-0.10.1
 2304051141 metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1
-2304051141 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
 2304051141 metadata/md5-cache/dev-python/sphinx_lv2_theme-1.2.2
 2304051141 metadata/md5-cache/dev-python/sphinx_selective_exclude-1.0.3-r1
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.4
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-asyncio-0.3.0-r1
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-autoprogram-0.1.8
-2304051141 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.2-r1
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.12.2
 2304051141 metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.2-r2
@@ -39937,7 +39985,6 @@
 2304051141 metadata/md5-cache/dev-python/spyder-vim-0.1.0
 2304051141 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.1.1-r1
 2304051141 metadata/md5-cache/dev-python/sqlitedict-2.1.0
-2304051141 metadata/md5-cache/dev-python/sqlparse-0.4.3
 2304051141 metadata/md5-cache/dev-python/sshtunnel-0.3.1
 2304051141 metadata/md5-cache/dev-python/ssl-fetch-0.4-r1
 2304051141 metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -40029,7 +40076,6 @@
 2304051141 metadata/md5-cache/dev-python/trustme-0.9.0-r1
 2304051141 metadata/md5-cache/dev-python/tubes-0.2.1
 2304051141 metadata/md5-cache/dev-python/tweedledum-1.1.1-r1
-2304051141 metadata/md5-cache/dev-python/twine-4.0.2
 2304051141 metadata/md5-cache/dev-python/twisted-22.10.0
 2304051141 metadata/md5-cache/dev-python/twython-3.9.1-r1
 2304051141 metadata/md5-cache/dev-python/txAMQP-0.8.2-r1
@@ -40076,7 +40122,6 @@
 2304051141 metadata/md5-cache/dev-python/vecrec-0.3.1-r1
 2304051141 metadata/md5-cache/dev-python/verboselogs-1.7-r1
 2304051141 metadata/md5-cache/dev-python/versioneer-0.28
-2304051141 metadata/md5-cache/dev-python/versioningit-2.2.0
 2304051141 metadata/md5-cache/dev-python/vine-5.0.0-r1
 2304051141 metadata/md5-cache/dev-python/virtualenv-20.20.0
 2304051141 metadata/md5-cache/dev-python/virtualenv-20.21.0
@@ -40124,7 +40169,6 @@
 2304051141 metadata/md5-cache/dev-python/wtforms-3.0.1-r1
 2304051141 metadata/md5-cache/dev-python/wurlitzer-3.0.3
 2304051141 metadata/md5-cache/dev-python/wxpython-4.0.7-r4
-2304051141 metadata/md5-cache/dev-python/wxpython-4.2.0
 2304051141 metadata/md5-cache/dev-python/x-wr-timezone-0.0.5
 2304051141 metadata/md5-cache/dev-python/xarray-2023.2.0
 2304051141 metadata/md5-cache/dev-python/xarray-2023.3.0
@@ -40191,7 +40235,6 @@
 2304071710 metadata/md5-cache/dev-python/flatdict-4.0.0
 2304070740 metadata/md5-cache/dev-python/inflect-6.0.4
 2304070740 metadata/md5-cache/dev-python/jaraco-collections-4.1.0
-2304071710 metadata/md5-cache/dev-python/jupyterlab-server-2.22.0
 2304070740 metadata/md5-cache/dev-python/lmdb-1.4.1
 2304070740 metadata/md5-cache/dev-python/mypy-1.2.0
 2304061910 metadata/md5-cache/dev-python/nox-2022.11.21-r1
@@ -40220,7 +40263,6 @@
 2304090510 metadata/md5-cache/dev-python/cffi-1.15.1-r2
 2304081410 metadata/md5-cache/dev-python/chameleon-4.0.0
 2304080840 metadata/md5-cache/dev-python/croniter-1.3.10
-2304090940 metadata/md5-cache/dev-python/cx_Freeze-6.14.9
 2304091240 metadata/md5-cache/dev-python/django-debug-toolbar-3.8.1
 2304100940 metadata/md5-cache/dev-python/dkimpy-1.1.2
 2304080840 metadata/md5-cache/dev-python/flask-babel-3.1.0
@@ -40228,14 +40270,10 @@
 2304081540 metadata/md5-cache/dev-python/fonttools-4.39.3
 2304100940 metadata/md5-cache/dev-python/frozendict-2.3.7
 2304090940 metadata/md5-cache/dev-python/fsspec-2023.4.0
-2304080840 metadata/md5-cache/dev-python/hypothesis-6.71.0
-2304100840 metadata/md5-cache/dev-python/importlib_metadata-6.0.1
-2304100840 metadata/md5-cache/dev-python/importlib_metadata-6.3.0
 2304100840 metadata/md5-cache/dev-python/jaraco-path-3.5.0
 2304081210 metadata/md5-cache/dev-python/jupyter-server-fileid-0.8.0
 2304100940 metadata/md5-cache/dev-python/jupyter-server-fileid-0.9.0
 2304081210 metadata/md5-cache/dev-python/jupyter-server-ydoc-0.8.0
-2304081210 metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
 2304081210 metadata/md5-cache/dev-python/jupyterlab-3.6.3
 2304081210 metadata/md5-cache/dev-python/keep-2.10.1-r2
 2304090940 metadata/md5-cache/dev-python/lmfit-1.2.0
@@ -40308,7 +40346,6 @@
 2304121040 metadata/md5-cache/dev-python/scikit-build-0.17.0
 2304112140 metadata/md5-cache/dev-python/shiboken2-5.15.9
 2304112310 metadata/md5-cache/dev-python/spur-0.3.23
-2304120410 metadata/md5-cache/dev-python/tornado-6.2-r1
 2304120810 metadata/md5-cache/dev-python/trimesh-3.21.5
 2304112140 metadata/md5-cache/dev-python/urllib3-1.26.15
 2304120610 metadata/md5-cache/dev-python/uvicorn-0.21.1
@@ -40323,13 +40360,6 @@
 2304130740 metadata/md5-cache/dev-python/botocore-1.29.112
 2304140640 metadata/md5-cache/dev-python/botocore-1.29.113
 2304131840 metadata/md5-cache/dev-python/cachelib-0.10.2-r1
-2304142240 metadata/md5-cache/dev-python/clang-python-14.0.6
-2304142240 metadata/md5-cache/dev-python/clang-python-15.0.7
-2304142240 metadata/md5-cache/dev-python/clang-python-16.0.1
-2304142240 metadata/md5-cache/dev-python/clang-python-16.0.2.9999
-2304142240 metadata/md5-cache/dev-python/clang-python-17.0.0.9999
-2304142240 metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325
-2304142240 metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414
 2304130910 metadata/md5-cache/dev-python/croniter-1.3.14
 2304130910 metadata/md5-cache/dev-python/google-auth-2.17.1
 2304130840 metadata/md5-cache/dev-python/google-auth-2.17.3
@@ -40344,23 +40374,12 @@
 2304141640 metadata/md5-cache/dev-python/ipyparallel-8.4.1
 2304141640 metadata/md5-cache/dev-python/ipyparallel-8.5.1
 2304141640 metadata/md5-cache/dev-python/ipyparallel-8.6.0
-2304141640 metadata/md5-cache/dev-python/jupyter-client-8.0.3
-2304141640 metadata/md5-cache/dev-python/jupyter-client-8.1.0
-2304141640 metadata/md5-cache/dev-python/jupyter-client-8.2.0
 2304141640 metadata/md5-cache/dev-python/jupyter-server-2.4.0
 2304141640 metadata/md5-cache/dev-python/jupyter-server-2.5.0
 2304141640 metadata/md5-cache/dev-python/jupyter_console-6.6.3
 2304141640 metadata/md5-cache/dev-python/jupyter_kernel_test-0.5.0
-2304140710 metadata/md5-cache/dev-python/jupyterlab-server-2.22.1
 2304131840 metadata/md5-cache/dev-python/kombu-5.3.0_beta3
 2304131840 metadata/md5-cache/dev-python/libvirt-python-9.2.0
-2304142240 metadata/md5-cache/dev-python/lit-14.0.6
-2304142240 metadata/md5-cache/dev-python/lit-15.0.7
-2304142240 metadata/md5-cache/dev-python/lit-16.0.1
-2304142240 metadata/md5-cache/dev-python/lit-16.0.2.9999
-2304142240 metadata/md5-cache/dev-python/lit-17.0.0.9999
-2304142240 metadata/md5-cache/dev-python/lit-17.0.0_pre20230325
-2304142240 metadata/md5-cache/dev-python/lit-17.0.0_pre20230414
 2304141640 metadata/md5-cache/dev-python/nbclient-0.7.2
 2304141640 metadata/md5-cache/dev-python/nbclient-0.7.3
 2304141640 metadata/md5-cache/dev-python/nbval-0.10.0
@@ -40386,7 +40405,6 @@
 2304130910 metadata/md5-cache/dev-python/rich-13.3.4
 2304130840 metadata/md5-cache/dev-python/scikit-build-0.17.1
 2304140710 metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.23.0
-2304131840 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2
 2304140710 metadata/md5-cache/dev-python/spotipy-2.23.0
 2304141640 metadata/md5-cache/dev-python/spyder-kernels-2.4.3
 2304141640 metadata/md5-cache/dev-python/statsmodels-0.13.2
@@ -40404,7 +40422,6 @@
 2304142310 metadata/md5-cache/dev-python/cerberus-1.3.4-r1
 2304151140 metadata/md5-cache/dev-python/cryptography-40.0.2
 2304142310 metadata/md5-cache/dev-python/csscompressor-0.9.5-r1
-2304151140 metadata/md5-cache/dev-python/dask-2023.4.0
 2304151140 metadata/md5-cache/dev-python/feedgenerator-2.1.0
 2304142310 metadata/md5-cache/dev-python/filebytes-0.10.2
 2304142310 metadata/md5-cache/dev-python/ghp-import-2.1.0-r1
@@ -40414,7 +40431,6 @@
 2304142310 metadata/md5-cache/dev-python/license-expression-30.1.0
 2304151140 metadata/md5-cache/dev-python/loky-3.4.0
 2304142310 metadata/md5-cache/dev-python/mergedeep-1.3.4
-2304142310 metadata/md5-cache/dev-python/mkdocs-1.4.2
 2304142310 metadata/md5-cache/dev-python/mkdocs-git-authors-plugin-0.7.0
 2304142310 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-1.2.0
 2304142310 metadata/md5-cache/dev-python/mkdocs-i18n-0.4.4
@@ -40424,7 +40440,6 @@
 2304142310 metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
 2304151140 metadata/md5-cache/dev-python/mss-8.0.3
 2304150140 metadata/md5-cache/dev-python/nbclassic-0.5.5
-2304142310 metadata/md5-cache/dev-python/nbconvert-7.3.1
 2304150140 metadata/md5-cache/dev-python/nbsphinx-0.9.1
 2304150140 metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
 2304142310 metadata/md5-cache/dev-python/pdm-pep517-1.1.4
@@ -40449,7 +40464,6 @@
 2304151140 metadata/md5-cache/dev-python/xmlschema-2.2.3
 2304150910 metadata/md5-cache/dev-python/xmlsec-1.3.12-r2
 2304151140 metadata/md5-cache/dev-python/zope-component-6.0
-2304161210 metadata/md5-cache/dev-python/PyQt6-6.5.0
 2304161210 metadata/md5-cache/dev-python/PyQt6-WebEngine-6.5.0
 2304160710 metadata/md5-cache/dev-python/argparse-manpage-4.1
 2304160710 metadata/md5-cache/dev-python/cachetools-5.3.0
@@ -40465,7 +40479,6 @@
 2304162010 metadata/md5-cache/dev-python/httpcore-0.17.0
 2304161940 metadata/md5-cache/dev-python/httpx-socks-0.7.5
 2304161940 metadata/md5-cache/dev-python/hypercorn-0.14.3-r1
-2304152310 metadata/md5-cache/dev-python/importlib_metadata-6.4.1
 2304162040 metadata/md5-cache/dev-python/jsonschema-spec-0.1.4
 2304161540 metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
 2304161540 metadata/md5-cache/dev-python/logical-unification-0.4.5
@@ -40477,7 +40490,6 @@
 2304161540 metadata/md5-cache/dev-python/nbval-0.10.0-r1
 2304161540 metadata/md5-cache/dev-python/notebook-6.5.4
 2304152310 metadata/md5-cache/dev-python/pip-23.1
-2304152310 metadata/md5-cache/dev-python/pip-run-10.0.7
 2304161540 metadata/md5-cache/dev-python/pyglet-2.0.5
 2304160710 metadata/md5-cache/dev-python/pyicu-2.11
 2304160710 metadata/md5-cache/dev-python/pyproject-api-1.5.1
@@ -40497,7 +40509,6 @@
 2304161940 metadata/md5-cache/dev-python/tiny-proxy-0.1.1
 2304161540 metadata/md5-cache/dev-python/toolz-0.12.0
 2304160710 metadata/md5-cache/dev-python/tox-4.4.12
-2304180840 metadata/md5-cache/dev-python/Manifest.gz
 2304180610 metadata/md5-cache/dev-python/aiosqlite-0.19.0
 2304171710 metadata/md5-cache/dev-python/astroid-2.15.3
 2304170940 metadata/md5-cache/dev-python/attrs-23.1.0
@@ -40509,7 +40520,6 @@
 2304180340 metadata/md5-cache/dev-python/cython-0.29.33-r1
 2304180340 metadata/md5-cache/dev-python/cython-0.29.34
 2304170940 metadata/md5-cache/dev-python/httpx-socks-0.7.6
-2304170940 metadata/md5-cache/dev-python/hypothesis-6.72.0
 2304162110 metadata/md5-cache/dev-python/identify-2.5.21
 2304170240 metadata/md5-cache/dev-python/jq-1.4.1
 2304170910 metadata/md5-cache/dev-python/mock-5.0.2
@@ -40522,10 +40532,118 @@
 2304171710 metadata/md5-cache/dev-python/rapidfuzz-3.0.0
 2304170240 metadata/md5-cache/dev-python/simplejson-3.18.4
 2304170840 metadata/md5-cache/dev-python/soupsieve-2.4.1
-2304180840 metadata/md5-cache/dev-python/sqlalchemy-2.0.7
 2304180840 metadata/md5-cache/dev-python/sqlalchemy-2.0.8
-2304170240 metadata/md5-cache/dev-python/typeguard-3.0.2
 2304170840 metadata/md5-cache/dev-python/zstandard-0.21.0
+2304200640 metadata/md5-cache/dev-python/Levenshtein-0.21.0
+2304202040 metadata/md5-cache/dev-python/Manifest.gz
+2304192340 metadata/md5-cache/dev-python/PyQt6-6.4.2
+2304192340 metadata/md5-cache/dev-python/PyQt6-6.5.0
+2304201940 metadata/md5-cache/dev-python/PyQt6-sip-13.5.1
+2304200640 metadata/md5-cache/dev-python/aws-sam-translator-1.65.0
+2304190910 metadata/md5-cache/dev-python/awxkit-22.1.0
+2304200540 metadata/md5-cache/dev-python/boto3-1.26.116
+2304200540 metadata/md5-cache/dev-python/botocore-1.29.116
+2304190840 metadata/md5-cache/dev-python/browser-cookie3-0.18.0
+2304200640 metadata/md5-cache/dev-python/cfn-lint-0.77.2
+2304192310 metadata/md5-cache/dev-python/clang-python-14.0.6
+2304192310 metadata/md5-cache/dev-python/clang-python-15.0.7
+2304192310 metadata/md5-cache/dev-python/clang-python-16.0.1
+2304192310 metadata/md5-cache/dev-python/clang-python-16.0.2
+2304192310 metadata/md5-cache/dev-python/clang-python-16.0.3.9999
+2304192310 metadata/md5-cache/dev-python/clang-python-17.0.0.9999
+2304192310 metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230325
+2304192310 metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230414
+2304191840 metadata/md5-cache/dev-python/cliff-4.2.0
+2304191840 metadata/md5-cache/dev-python/cssutils-2.6.0
+2304191840 metadata/md5-cache/dev-python/cx_Freeze-6.13.1
+2304191840 metadata/md5-cache/dev-python/cx_Freeze-6.14.5
+2304191840 metadata/md5-cache/dev-python/cx_Freeze-6.14.9
+2304191840 metadata/md5-cache/dev-python/dask-2023.3.2
+2304191840 metadata/md5-cache/dev-python/dask-2023.4.0
+2304190940 metadata/md5-cache/dev-python/diskcache-5.6.1
+2304191840 metadata/md5-cache/dev-python/dns-lexicon-3.11.7
+2304190940 metadata/md5-cache/dev-python/filelock-3.12.0
+2304191840 metadata/md5-cache/dev-python/flask-2.2.3
+2304190940 metadata/md5-cache/dev-python/google-api-python-client-2.86.0
+2304191840 metadata/md5-cache/dev-python/helpdev-0.7.1-r1
+2304200740 metadata/md5-cache/dev-python/hypothesis-6.71.0
+2304200640 metadata/md5-cache/dev-python/hypothesis-6.72.1
+2304190740 metadata/md5-cache/dev-python/iminuit-2.21.3
+2304191840 metadata/md5-cache/dev-python/importlib-metadata-6.0.1
+2304191840 metadata/md5-cache/dev-python/importlib-metadata-6.5.0
+2304191840 metadata/md5-cache/dev-python/importlib-resources-5.12.0
+2304191840 metadata/md5-cache/dev-python/jsonschema-4.17.3
+2304191840 metadata/md5-cache/dev-python/jupyter-client-8.0.3
+2304191840 metadata/md5-cache/dev-python/jupyter-client-8.1.0
+2304191840 metadata/md5-cache/dev-python/jupyter-client-8.2.0
+2304191840 metadata/md5-cache/dev-python/jupyter-lsp-2.0.1
+2304191840 metadata/md5-cache/dev-python/jupyter_ydoc-1.0.0
+2304191840 metadata/md5-cache/dev-python/jupyterlab-server-2.22.0
+2304191840 metadata/md5-cache/dev-python/jupyterlab-server-2.22.1
+2304191840 metadata/md5-cache/dev-python/keyring-23.13.1-r1
+2304192310 metadata/md5-cache/dev-python/lit-14.0.6
+2304192310 metadata/md5-cache/dev-python/lit-15.0.7
+2304192310 metadata/md5-cache/dev-python/lit-16.0.1
+2304192310 metadata/md5-cache/dev-python/lit-16.0.2
+2304192310 metadata/md5-cache/dev-python/lit-16.0.3.9999
+2304192310 metadata/md5-cache/dev-python/lit-17.0.0.9999
+2304192310 metadata/md5-cache/dev-python/lit-17.0.0_pre20230325
+2304192310 metadata/md5-cache/dev-python/lit-17.0.0_pre20230414
+2304202010 metadata/md5-cache/dev-python/looseversion-1.1.2
+2304191840 metadata/md5-cache/dev-python/markdown-3.3.7
+2304191840 metadata/md5-cache/dev-python/markdown-3.4.1
+2304191840 metadata/md5-cache/dev-python/markdown-3.4.3
+2304191840 metadata/md5-cache/dev-python/matplotlib-3.7.0
+2304191840 metadata/md5-cache/dev-python/matplotlib-3.7.1
+2304191840 metadata/md5-cache/dev-python/matrix-common-1.3.0
+2304190910 metadata/md5-cache/dev-python/meson-python-0.13.0
+2304191840 metadata/md5-cache/dev-python/mkdocs-1.4.2
+2304190910 metadata/md5-cache/dev-python/mss-9.0.0
+2304191840 metadata/md5-cache/dev-python/nbconvert-7.2.10-r1
+2304191840 metadata/md5-cache/dev-python/nbconvert-7.2.9
+2304191840 metadata/md5-cache/dev-python/nbconvert-7.3.0
+2304191840 metadata/md5-cache/dev-python/nbconvert-7.3.1
+2304191840 metadata/md5-cache/dev-python/nspektr-0.4.0
+2304191840 metadata/md5-cache/dev-python/openstacksdk-1.0.1
+2304191840 metadata/md5-cache/dev-python/oslo-config-9.1.1
+2304190940 metadata/md5-cache/dev-python/peewee-3.16.1
+2304190910 metadata/md5-cache/dev-python/phonenumbers-8.13.10
+2304191840 metadata/md5-cache/dev-python/pip-run-10.0.5-r1
+2304191840 metadata/md5-cache/dev-python/pip-run-10.0.7
+2304190940 metadata/md5-cache/dev-python/podcastparser-0.6.10
+2304191210 metadata/md5-cache/dev-python/psutil-5.9.5
+2304191310 metadata/md5-cache/dev-python/pyacoustid-1.2.2-r1
+2304200640 metadata/md5-cache/dev-python/pyasn1-0.5.0
+2304200640 metadata/md5-cache/dev-python/pyasn1-modules-0.3.0
+2304191310 metadata/md5-cache/dev-python/pychromecast-13.0.7
+2304190910 metadata/md5-cache/dev-python/pygments-2.15.1
+2304192010 metadata/md5-cache/dev-python/pyside6-6.5.0
+2304192010 metadata/md5-cache/dev-python/pyside6-tools-6.5.0
+2304202010 metadata/md5-cache/dev-python/pytest-custom-exit-code-0.3.0
+2304202040 metadata/md5-cache/dev-python/pytest-salt-factories-1.0.0_rc23
+2304200640 metadata/md5-cache/dev-python/python-email-validator-2.0.0_p2
+2304200640 metadata/md5-cache/dev-python/python-engineio-4.4.1
+2304192010 metadata/md5-cache/dev-python/python-vlc-3.0.18122
+2304191840 metadata/md5-cache/dev-python/setuptools-67.6.1
+2304192010 metadata/md5-cache/dev-python/shiboken6-6.5.0
+2304191840 metadata/md5-cache/dev-python/signedjson-1.1.4
+2304191840 metadata/md5-cache/dev-python/sphinx-4.5.0-r1
+2304191840 metadata/md5-cache/dev-python/sphinx-5.3.0
+2304191840 metadata/md5-cache/dev-python/sphinx-6.1.3
+2304191310 metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r2
+2304191840 metadata/md5-cache/dev-python/sphinxcontrib-bibtex-2.5.0
+2304190440 metadata/md5-cache/dev-python/sqlalchemy-2.0.7
+2304191040 metadata/md5-cache/dev-python/sqlparse-0.4.4
+2304190440 metadata/md5-cache/dev-python/tornado-6.2-r1
+2304190940 metadata/md5-cache/dev-python/tornado-6.3
+2304190940 metadata/md5-cache/dev-python/trove-classifiers-2023.4.18
+2304191840 metadata/md5-cache/dev-python/twine-4.0.2
+2304191840 metadata/md5-cache/dev-python/typeguard-3.0.2
+2304191840 metadata/md5-cache/dev-python/versioningit-2.2.0
+2304201410 metadata/md5-cache/dev-python/wxpython-4.2.0
+2304190940 metadata/md5-cache/dev-python/xarray-2023.4.1
+2304190140 metadata/md5-cache/dev-python/yapf-0.33.0
+2304200310 metadata/md5-cache/dev-python/ytmusicapi-1.0.1
 2303261541 metadata/md5-cache/dev-qt/qt-creator-8.0.2
 2303261541 metadata/md5-cache/dev-qt/qt5compat-6.4.3
 2303261541 metadata/md5-cache/dev-qt/qtbase-6.4.3
@@ -40880,7 +40998,6 @@
 2304101210 metadata/md5-cache/dev-ruby/contracts-0.16.1
 2304101210 metadata/md5-cache/dev-ruby/contracts-0.17
 2304101210 metadata/md5-cache/dev-ruby/contracts-0.17-r1
-2304101210 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
 2304101210 metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r2
 2304101210 metadata/md5-cache/dev-ruby/crack-0.4.4-r3
 2304101210 metadata/md5-cache/dev-ruby/crass-1.0.6-r1
@@ -41057,7 +41174,6 @@
 2304101210 metadata/md5-cache/dev-ruby/io-event-1.1.6
 2304101210 metadata/md5-cache/dev-ruby/io-wait-0.2.1
 2304101210 metadata/md5-cache/dev-ruby/io-wait-0.2.3
-2304101210 metadata/md5-cache/dev-ruby/itextomml-1.6.1
 2304101210 metadata/md5-cache/dev-ruby/jbuilder-2.11.5
 2304101210 metadata/md5-cache/dev-ruby/jmespath-1.6.1
 2304101210 metadata/md5-cache/dev-ruby/jmespath-1.6.1-r1
@@ -41484,7 +41600,6 @@
 2304101210 metadata/md5-cache/dev-ruby/rubyzip-2.3.2-r1
 2304101210 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r1
 2304101210 metadata/md5-cache/dev-ruby/safe_yaml-1.0.5-r2
-2304101210 metadata/md5-cache/dev-ruby/sanitize-6.0.1
 2304101210 metadata/md5-cache/dev-ruby/sass-3.7.4-r1
 2304101210 metadata/md5-cache/dev-ruby/sass-3.7.4-r2
 2304101210 metadata/md5-cache/dev-ruby/sass-listen-4.0.0-r1
@@ -41761,7 +41876,6 @@
 2304161310 metadata/md5-cache/dev-ruby/activejob-7.0.4.3-r1
 2304161040 metadata/md5-cache/dev-ruby/mechanize-2.8.5
 2304161040 metadata/md5-cache/dev-ruby/mechanize-2.9.0
-2304180940 metadata/md5-cache/dev-ruby/Manifest.gz
 2304170910 metadata/md5-cache/dev-ruby/asciimath-2.0.5
 2304171310 metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.1.0-r2
 2304171440 metadata/md5-cache/dev-ruby/blankslate-3.1.3-r2
@@ -41774,6 +41888,13 @@
 2304180340 metadata/md5-cache/dev-ruby/rdtool-0.6.38-r3
 2304170240 metadata/md5-cache/dev-ruby/stringio-3.0.5
 2304170240 metadata/md5-cache/dev-ruby/typeprof-0.21.7
+2304192340 metadata/md5-cache/dev-ruby/Manifest.gz
+2304192340 metadata/md5-cache/dev-ruby/coolio-1.7.1-r1
+2304192340 metadata/md5-cache/dev-ruby/debug_inspector-1.1.0-r1
+2304192340 metadata/md5-cache/dev-ruby/itextomml-1.6.1
+2304192210 metadata/md5-cache/dev-ruby/parallel-1.23.0
+2304192210 metadata/md5-cache/dev-ruby/ruby-termios-1.1.0-r2
+2304192340 metadata/md5-cache/dev-ruby/sanitize-6.0.1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -41899,7 +42020,6 @@
 2303261522 metadata/md5-cache/dev-tcltk/tcllib-1.20
 2303261522 metadata/md5-cache/dev-tcltk/tcllib-1.21
 2303261522 metadata/md5-cache/dev-tcltk/tclpython-5.0-r1
-2303261522 metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
 2303261522 metadata/md5-cache/dev-tcltk/tclreadline-2.1.0-r5
 2303261522 metadata/md5-cache/dev-tcltk/tclreadline-2.3.8-r2
 2303261522 metadata/md5-cache/dev-tcltk/tclx-8.4.4-r4
@@ -41916,10 +42036,11 @@
 2303261522 metadata/md5-cache/dev-tcltk/tktreectrl-2.4.1
 2303261522 metadata/md5-cache/dev-tcltk/tls-1.7.22-r1
 2304051141 metadata/md5-cache/dev-tcltk/snack-2.2.10-r11
-2304051141 metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
 2304071910 metadata/md5-cache/dev-tcltk/tdom-0.9.1
-2304161540 metadata/md5-cache/dev-tcltk/Manifest.gz
 2304161540 metadata/md5-cache/dev-tcltk/togl-2.0-r4
+2304200710 metadata/md5-cache/dev-tcltk/Manifest.gz
+2304200710 metadata/md5-cache/dev-tcltk/snack-2.2.10-r12
+2304200710 metadata/md5-cache/dev-tcltk/tclpython-5.0-r2
 1702282321 metadata/md5-cache/dev-tex/cpp2latex-2.3-r2
 2001131939 metadata/md5-cache/dev-tex/serienbrief-0.2.5
 1912151409 metadata/md5-cache/dev-tex/style-check-0.14
@@ -42121,7 +42242,6 @@
 2303261522 metadata/md5-cache/dev-util/ald-0.1.7-r2
 2303261522 metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
 2303261541 metadata/md5-cache/dev-util/android-tools-33.0.3-r1
-2303261541 metadata/md5-cache/dev-util/android-tools-34.0.0
 2303261522 metadata/md5-cache/dev-util/android-udev-rules-20220903
 2303261522 metadata/md5-cache/dev-util/android-udev-rules-20230104
 2303261522 metadata/md5-cache/dev-util/android-udev-rules-20230303
@@ -42196,7 +42316,6 @@
 2303261522 metadata/md5-cache/dev-util/cpputest-4.0
 2303261522 metadata/md5-cache/dev-util/cproto-4.7t-r1
 2303261522 metadata/md5-cache/dev-util/cproto-4.7u-r1
-2303261522 metadata/md5-cache/dev-util/cproto-4.7v
 2303261522 metadata/md5-cache/dev-util/crash-7.3.1
 2303261522 metadata/md5-cache/dev-util/crash-8.0.0-r1
 2303261522 metadata/md5-cache/dev-util/crash-8.0.1
@@ -42223,7 +42342,6 @@
 2303261522 metadata/md5-cache/dev-util/diffstat-1.65
 2303261522 metadata/md5-cache/dev-util/difftastic-0.45.0
 2303261522 metadata/md5-cache/dev-util/diffuse-0.7.5
-2303261522 metadata/md5-cache/dev-util/diffuse-0.7.7
 2303261522 metadata/md5-cache/dev-util/dirdiff-2.1-r4
 2303261522 metadata/md5-cache/dev-util/directx-headers-9999
 2303261522 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -42266,7 +42384,6 @@
 2303261522 metadata/md5-cache/dev-util/hxd-0.70.02-r2
 2303261541 metadata/md5-cache/dev-util/icemon-3.3
 2303261522 metadata/md5-cache/dev-util/icmake-9.03.01
-2303261541 metadata/md5-cache/dev-util/ignition-cmake-2.14.0
 2303261522 metadata/md5-cache/dev-util/imediff2-1.1.2.1
 2303261541 metadata/md5-cache/dev-util/include-what-you-use-0.19
 2303261522 metadata/md5-cache/dev-util/indent-2.2.12
@@ -42338,7 +42455,6 @@
 2303261522 metadata/md5-cache/dev-util/pretrace-0.4-r2
 2303261522 metadata/md5-cache/dev-util/pscan-20000721-r1
 2303261522 metadata/md5-cache/dev-util/pwndbg-20221219-r2
-2303261522 metadata/md5-cache/dev-util/pwndbg-20230319
 2303261522 metadata/md5-cache/dev-util/pwndbg-99999999
 2303261522 metadata/md5-cache/dev-util/py-spy-0.3.14
 2303261522 metadata/md5-cache/dev-util/pycharm-community-2022.2.3
@@ -42372,7 +42488,6 @@
 2303261522 metadata/md5-cache/dev-util/rinstall-0.1.1
 2303261522 metadata/md5-cache/dev-util/rinstall-0.2.0
 2303261522 metadata/md5-cache/dev-util/rizin-0.4.1
-2303261522 metadata/md5-cache/dev-util/rizin-0.5.1
 2303261541 metadata/md5-cache/dev-util/rocm-cmake-5.1.3
 2303261541 metadata/md5-cache/dev-util/rocm-cmake-5.3.3
 2303261541 metadata/md5-cache/dev-util/rocm-cmake-5.4.3
@@ -42503,7 +42618,6 @@
 2304010440 metadata/md5-cache/dev-util/libabigail-2.2
 2303311510 metadata/md5-cache/dev-util/strace-6.1
 2304051141 metadata/md5-cache/dev-util/ROPgadget-7.2
-2304051141 metadata/md5-cache/dev-util/ROPgadget-7.3
 2304051141 metadata/md5-cache/dev-util/ROPgadget-9999
 2304051141 metadata/md5-cache/dev-util/Tensile-5.1.3-r3
 2304051141 metadata/md5-cache/dev-util/Tensile-5.4.2-r2
@@ -42570,7 +42684,6 @@
 2304051141 metadata/md5-cache/dev-util/howdoi-2.0.19
 2304051141 metadata/md5-cache/dev-util/howdoi-2.0.20
 2304031010 metadata/md5-cache/dev-util/ltrace-0.7.91_pre20221216-r1
-2304051810 metadata/md5-cache/dev-util/maturin-0.14.16
 2304051810 metadata/md5-cache/dev-util/maturin-1.0.0_beta7
 2304020410 metadata/md5-cache/dev-util/meld-3.22.0-r2
 2304051141 metadata/md5-cache/dev-util/meson-1.0.1
@@ -42578,7 +42691,6 @@
 2304051141 metadata/md5-cache/dev-util/pwntools-4.10.0_beta0-r2
 2304051141 metadata/md5-cache/dev-util/pwntools-4.9.0-r2
 2304051141 metadata/md5-cache/dev-util/pwntools-9999
-2304051141 metadata/md5-cache/dev-util/rbtools-4.0-r1
 2304020410 metadata/md5-cache/dev-util/regexxer-0.10-r2
 2304051141 metadata/md5-cache/dev-util/repolite-0.4.0
 2304051141 metadata/md5-cache/dev-util/ropper-9999
@@ -42604,11 +42716,9 @@
 2304051141 metadata/md5-cache/dev-util/yamllint-1.29.0
 2304051141 metadata/md5-cache/dev-util/yamllint-1.30.0
 2304051141 metadata/md5-cache/dev-util/ydiff-1.2
-2304051141 metadata/md5-cache/dev-util/ydiff-1.2-r1
 2304071210 metadata/md5-cache/dev-util/byacc-20230219
 2304071910 metadata/md5-cache/dev-util/duma-2.5.15-r2
 2304070910 metadata/md5-cache/dev-util/jenkins-bin-2.387.2
-2304061810 metadata/md5-cache/dev-util/maturin-0.14.17
 2304072010 metadata/md5-cache/dev-util/muon-0.2.0
 2304061910 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.7.0-r4
 2304061910 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.8.0-r3
@@ -42686,13 +42796,6 @@
 2304130610 metadata/md5-cache/dev-util/cucumber-wire-6.2.1
 2304141240 metadata/md5-cache/dev-util/kbuild-0.1.9998.3572-r4
 2304131710 metadata/md5-cache/dev-util/librnp-0.16.3
-2304142240 metadata/md5-cache/dev-util/lldb-14.0.6
-2304142240 metadata/md5-cache/dev-util/lldb-15.0.7
-2304142240 metadata/md5-cache/dev-util/lldb-16.0.1
-2304142240 metadata/md5-cache/dev-util/lldb-16.0.2.9999
-2304142240 metadata/md5-cache/dev-util/lldb-17.0.0.9999
-2304142240 metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325
-2304142240 metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414
 2304141340 metadata/md5-cache/dev-util/tree-sitter-cli-0.20.8
 2304140710 metadata/md5-cache/dev-util/watchman-2023.04.10.00
 2304150140 metadata/md5-cache/dev-util/b2-4.9.6
@@ -42707,7 +42810,6 @@
 2304162040 metadata/md5-cache/dev-util/kbuild-0.1.9998.3499-r4
 2304160910 metadata/md5-cache/dev-util/meson-1.1.0
 2304161310 metadata/md5-cache/dev-util/shards-0.17.3
-2304181040 metadata/md5-cache/dev-util/Manifest.gz
 2304180340 metadata/md5-cache/dev-util/cflow-1.7
 2304180040 metadata/md5-cache/dev-util/clair-4.4.4
 2304180340 metadata/md5-cache/dev-util/cmake-3.24.3
@@ -42728,7 +42830,6 @@
 2304180040 metadata/md5-cache/dev-util/drone-cli-1.5.0
 2304180040 metadata/md5-cache/dev-util/fq-0.2.0-r1
 2304180040 metadata/md5-cache/dev-util/fq-0.3.0
-2304180040 metadata/md5-cache/dev-util/fq-0.4.0
 2304180040 metadata/md5-cache/dev-util/fq-0.5.0
 2304180040 metadata/md5-cache/dev-util/github-cli-2.18.0
 2304180040 metadata/md5-cache/dev-util/github-cli-2.20.2
@@ -42788,6 +42889,29 @@
 2304180040 metadata/md5-cache/dev-util/web_page_replay_go-20221028
 2304180040 metadata/md5-cache/dev-util/webhook-2.7.0
 2304180040 metadata/md5-cache/dev-util/woke-0.19.0
+2304200810 metadata/md5-cache/dev-util/Manifest.gz
+2304190940 metadata/md5-cache/dev-util/ROPgadget-7.3
+2304191440 metadata/md5-cache/dev-util/android-tools-34.0.0
+2304190940 metadata/md5-cache/dev-util/cproto-4.7v
+2304191440 metadata/md5-cache/dev-util/diffuse-0.7.7
+2304190940 metadata/md5-cache/dev-util/fq-0.4.0
+2304191940 metadata/md5-cache/dev-util/gn-0.2088
+2304181640 metadata/md5-cache/dev-util/ignition-cmake-2.16.0
+2304190010 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.13822.1
+2304192310 metadata/md5-cache/dev-util/lldb-14.0.6
+2304192310 metadata/md5-cache/dev-util/lldb-15.0.7
+2304192310 metadata/md5-cache/dev-util/lldb-16.0.1
+2304192310 metadata/md5-cache/dev-util/lldb-16.0.2
+2304192310 metadata/md5-cache/dev-util/lldb-16.0.3.9999
+2304192310 metadata/md5-cache/dev-util/lldb-17.0.0.9999
+2304192310 metadata/md5-cache/dev-util/lldb-17.0.0_pre20230325
+2304192310 metadata/md5-cache/dev-util/lldb-17.0.0_pre20230414
+2304190910 metadata/md5-cache/dev-util/maturin-0.14.17
+2304190740 metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p3
+2304190940 metadata/md5-cache/dev-util/pwndbg-20230319
+2304191840 metadata/md5-cache/dev-util/rbtools-4.0-r1
+2304190940 metadata/md5-cache/dev-util/rizin-0.5.1
+2304200810 metadata/md5-cache/dev-util/ydiff-1.2-r1
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2103230739 metadata/md5-cache/dev-vcs/cvsutils-0.2.6
@@ -42835,7 +42959,6 @@
 2303261522 metadata/md5-cache/dev-vcs/gitolite-3.6.11-r1
 2303261522 metadata/md5-cache/dev-vcs/gitolite-3.6.12
 2303261522 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r3
-2303261522 metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
 2303261522 metadata/md5-cache/dev-vcs/notify-webhook-0.1.0-r1
 2303261541 metadata/md5-cache/dev-vcs/qgit-2.10
 2303261522 metadata/md5-cache/dev-vcs/rcsi-0.5
@@ -42856,7 +42979,6 @@
 2304051141 metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
 2304051141 metadata/md5-cache/dev-vcs/git-big-picture-1.2.2-r1
 2304051141 metadata/md5-cache/dev-vcs/git-cola-4.0.1
-2304051141 metadata/md5-cache/dev-vcs/git-cola-4.1.0
 2304051141 metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.3.1
 2304051141 metadata/md5-cache/dev-vcs/git-delete-merged-branches-7.4.0
 2304051141 metadata/md5-cache/dev-vcs/git-filter-repo-2.38.0-r1
@@ -42890,7 +43012,6 @@
 2304090110 metadata/md5-cache/dev-vcs/subversion-1.14.2-r1
 2304140710 metadata/md5-cache/dev-vcs/rcs-5.10.1-r1
 2304151540 metadata/md5-cache/dev-vcs/git-cola-4.2.1
-2304180340 metadata/md5-cache/dev-vcs/Manifest.gz
 2304180040 metadata/md5-cache/dev-vcs/git-lfs-3.2.0
 2304180040 metadata/md5-cache/dev-vcs/git-lfs-9999
 2304180040 metadata/md5-cache/dev-vcs/git-sizer-1.5.0
@@ -42901,6 +43022,10 @@
 2304180340 metadata/md5-cache/dev-vcs/mercurial-6.4
 2304180340 metadata/md5-cache/dev-vcs/mercurial-9999
 2304180040 metadata/md5-cache/dev-vcs/reposurgeon-4.27
+2304201540 metadata/md5-cache/dev-vcs/Manifest.gz
+2304201540 metadata/md5-cache/dev-vcs/git-cola-4.1.0
+2304191110 metadata/md5-cache/dev-vcs/git-machete-3.17.0
+2304191110 metadata/md5-cache/dev-vcs/gitstats-0_pre20201124
 2211221710 metadata/md5-cache/games-action/descent1-freedata-1
 2211221710 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 2211221710 metadata/md5-cache/games-action/descent2-freedata-1
@@ -43038,7 +43163,6 @@
 2303261541 metadata/md5-cache/games-arcade/cdogs-sdl-1.4.1
 2303261522 metadata/md5-cache/games-arcade/ceferino-0.97.8-r3
 2303261522 metadata/md5-cache/games-arcade/circuslinux-1.0.3-r2
-2303261541 metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
 2303261522 metadata/md5-cache/games-arcade/conveysdl-1.3-r2
 2303261522 metadata/md5-cache/games-arcade/cosmosmash-1.4.8-r1
 2303261522 metadata/md5-cache/games-arcade/crack-attack-1.1.14-r2
@@ -43116,8 +43240,9 @@
 2304061910 metadata/md5-cache/games-arcade/rocksndiamonds-4.3.4.0
 2304061910 metadata/md5-cache/games-arcade/shovel-knight-4.1b
 2304061910 metadata/md5-cache/games-arcade/thinktanks-demo-1.1-r4
-2304082140 metadata/md5-cache/games-arcade/Manifest.gz
 2304082140 metadata/md5-cache/games-arcade/xboing-2.4-r4
+2304190640 metadata/md5-cache/games-arcade/Manifest.gz
+2304190640 metadata/md5-cache/games-arcade/commandergenius-2.4.0-r1
 2104190739 metadata/md5-cache/games-board/gnuchess-book-1.02-r1
 2104041039 metadata/md5-cache/games-board/grhino-0.16.1-r2
 2003311339 metadata/md5-cache/games-board/polyglot-1.4.70b-r3
@@ -43262,7 +43387,6 @@
 2303261522 metadata/md5-cache/games-emulation/nestopia-1.52.0
 2303261522 metadata/md5-cache/games-emulation/nestopia-jg-1.52.0
 2303261522 metadata/md5-cache/games-emulation/nestopia-jg-9999
-2303261522 metadata/md5-cache/games-emulation/openmsx-18.0-r2
 2303261541 metadata/md5-cache/games-emulation/pcsx2-1.6.0-r3
 2303261541 metadata/md5-cache/games-emulation/pcsx2-1.7.3738
 2303261541 metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
@@ -43285,13 +43409,14 @@
 2303311110 metadata/md5-cache/games-emulation/snes9x-1.62.3
 2304050610 metadata/md5-cache/games-emulation/melonds-0.9.5-r4
 2304050610 metadata/md5-cache/games-emulation/melonds-9999
-2304042240 metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
 2304071910 metadata/md5-cache/games-emulation/gcube-0.4-r2
 2304071910 metadata/md5-cache/games-emulation/mamory-0.2.25-r1
 2304100810 metadata/md5-cache/games-emulation/fceux-2.6.5
 2304081710 metadata/md5-cache/games-emulation/m64py-0.2.5_p20211222
-2304161010 metadata/md5-cache/games-emulation/Manifest.gz
 2304161010 metadata/md5-cache/games-emulation/cega-jg-0.6.0
+2304190640 metadata/md5-cache/games-emulation/Manifest.gz
+2304190640 metadata/md5-cache/games-emulation/openmsx-18.0-r2
+2304190640 metadata/md5-cache/games-emulation/ppsspp-1.14.4-r2
 2204021210 metadata/md5-cache/games-engines/zoom-1.1.5-r1
 2303261541 metadata/md5-cache/games-engines/box2d-2.4.1
 2303261522 metadata/md5-cache/games-engines/dMagnetic-0.36
@@ -43611,7 +43736,6 @@
 2304090340 metadata/md5-cache/games-roguelike/Manifest.gz
 2304090340 metadata/md5-cache/games-roguelike/stone-soup-0.30.0_pre20230408
 2104161439 metadata/md5-cache/games-rpg/xu4-0.9-r1
-2207010040 metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
 2211080910 metadata/md5-cache/games-rpg/freedink-data-1.08.20190120
 2302231710 metadata/md5-cache/games-rpg/bass-1.3-r1
 2302231710 metadata/md5-cache/games-rpg/coe2-2007-r3
@@ -43660,26 +43784,24 @@
 2304061910 metadata/md5-cache/games-rpg/grimrock-20150707
 2304061910 metadata/md5-cache/games-rpg/to-the-moon-0-r1
 2304061910 metadata/md5-cache/games-rpg/vendetta-online-bin-1.8.296-r1
-2304161910 metadata/md5-cache/games-rpg/Manifest.gz
 2304161910 metadata/md5-cache/games-rpg/crosscode-1.4.2.2-r1
+2304190740 metadata/md5-cache/games-rpg/Manifest.gz
+2304190740 metadata/md5-cache/games-rpg/manaplus-1.9.3.23-r1
 2106302209 metadata/md5-cache/games-server/crossfire-server-1.71.0-r2
 1702282323 metadata/md5-cache/games-server/mednafen-server-0.5.2-r1
 2209170112 metadata/md5-cache/games-server/etqw-ded-1.5-r1
 2210082110 metadata/md5-cache/games-server/mtavc-0.5-r2
 2303180118 metadata/md5-cache/games-server/ut2004-ded-3369.3-r2
-2303261522 metadata/md5-cache/games-server/minecraft-server-1.19.3
-2303261522 metadata/md5-cache/games-server/minecraft-server-1.19.4
 2303261541 metadata/md5-cache/games-server/pvpgn-1.99.7.2.1-r1
 2303261522 metadata/md5-cache/games-server/steamcmd-1.0-r4
 2304012310 metadata/md5-cache/games-server/bedrock-server-1.19.73.02
-2304071910 metadata/md5-cache/games-server/Manifest.gz
 2304071910 metadata/md5-cache/games-server/monopd-0.10.2-r1
+2304192210 metadata/md5-cache/games-server/Manifest.gz
+2304192210 metadata/md5-cache/games-server/minecraft-server-1.19.4
 2202261509 metadata/md5-cache/games-simulation/simutrans-paksets-123.0.1
 2212102340 metadata/md5-cache/games-simulation/flightgear-data-2020.3.17
 2302231710 metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
 2302231710 metadata/md5-cache/games-simulation/gl117-1.3.2-r1
-2303261541 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
-2303261541 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
 2303261541 metadata/md5-cache/games-simulation/corsix-th-0.66-r1
 2303261522 metadata/md5-cache/games-simulation/crashtest-1.1-r2
 2303261522 metadata/md5-cache/games-simulation/crrcsim-0.9.13-r2
@@ -43689,20 +43811,20 @@
 2303261522 metadata/md5-cache/games-simulation/lincity-1.13.1-r4
 2303261522 metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
 2303261522 metadata/md5-cache/games-simulation/micropolis-1.0_p20180313
-2303261541 metadata/md5-cache/games-simulation/openrct2-0.4.3
 2303261541 metadata/md5-cache/games-simulation/openttd-13.0
 2303261522 metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
 2303261522 metadata/md5-cache/games-simulation/searchandrescue-1.7.0-r1
 2303261522 metadata/md5-cache/games-simulation/senken-0.3.0-r2
 2303261522 metadata/md5-cache/games-simulation/simutrans-123.0.1-r1
 2303261522 metadata/md5-cache/games-simulation/sky-rogue-1.3.3
-2304030040 metadata/md5-cache/games-simulation/openrct2-0.4.4
 2304012310 metadata/md5-cache/games-simulation/openrct2-9999
 2304051141 metadata/md5-cache/games-simulation/singularity-1.00-r2
 2304061910 metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
 2304061910 metadata/md5-cache/games-simulation/train-valley-1.3.31403
-2304161040 metadata/md5-cache/games-simulation/Manifest.gz
 2304161040 metadata/md5-cache/games-simulation/openttd-13.1
+2304201740 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.10.28
+2304201740 metadata/md5-cache/games-simulation/Manifest.gz
+2304190010 metadata/md5-cache/games-simulation/openrct2-0.4.4
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2302231710 metadata/md5-cache/games-sports/billardgl-1.75-r2
 2302231710 metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
@@ -43720,13 +43842,11 @@
 2303261522 metadata/md5-cache/games-strategy/0ad-0.0.26_alpha
 2303261541 metadata/md5-cache/games-strategy/augustus-3.1.0
 2303261541 metadata/md5-cache/games-strategy/colobot-0.1.12
-2303261541 metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
 2303261541 metadata/md5-cache/games-strategy/colobot-9999
 2303261522 metadata/md5-cache/games-strategy/defcon-demo-1.60-r1
 2303261522 metadata/md5-cache/games-strategy/dominions2-2.16-r1
 2303261522 metadata/md5-cache/games-strategy/dopewars-1.6.1
 2303261522 metadata/md5-cache/games-strategy/dunelegacy-0.96.4
-2303261522 metadata/md5-cache/games-strategy/endless-sky-0.9.16.1
 2303261522 metadata/md5-cache/games-strategy/freecol-1.0.0
 2303261541 metadata/md5-cache/games-strategy/freeorion-0.4.10.2-r1
 2303261541 metadata/md5-cache/games-strategy/freesynd-0.7.5
@@ -43775,8 +43895,10 @@
 2304081710 metadata/md5-cache/games-strategy/colobot-data-0.2.0_alpha
 2304100840 metadata/md5-cache/games-strategy/freeorion-0.5
 2304100840 metadata/md5-cache/games-strategy/freeorion-9999
-2304180740 metadata/md5-cache/games-strategy/Manifest.gz
 2304180740 metadata/md5-cache/games-strategy/warzone2100-4.3.5
+2304190740 metadata/md5-cache/games-strategy/Manifest.gz
+2304190740 metadata/md5-cache/games-strategy/colobot-0.2.0_alpha
+2304190640 metadata/md5-cache/games-strategy/endless-sky-0.9.16.1
 2104212209 metadata/md5-cache/games-util/xgame-1.7.1-r1
 1707090139 metadata/md5-cache/games-util/xgame-gtk2-2.0.2-r1
 2303261541 metadata/md5-cache/games-util/acc-1.58
@@ -43878,8 +44000,9 @@
 2304020410 metadata/md5-cache/gnome-base/nautilus-42.2
 2304020410 metadata/md5-cache/gnome-base/nautilus-43.2
 2304020410 metadata/md5-cache/gnome-base/nautilus-44.0
-2304101610 metadata/md5-cache/gnome-base/Manifest.gz
 2304101610 metadata/md5-cache/gnome-base/gnome-shell-43.4
+2304181910 metadata/md5-cache/gnome-base/Manifest.gz
+2304181910 metadata/md5-cache/gnome-base/gnome-settings-daemon-44.1
 2212171010 metadata/md5-cache/gnome-extra/gnome-shell-frippery-43.0
 2212241810 metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
 2212241810 metadata/md5-cache/gnome-extra/cinnamon-translations-5.6.1
@@ -43903,18 +44026,14 @@
 2303261522 metadata/md5-cache/gnome-extra/eiciel-0.10.0
 2303261541 metadata/md5-cache/gnome-extra/gnome-browser-connector-10-r5
 2303261522 metadata/md5-cache/gnome-extra/gnome-firmware-43.0
-2303261522 metadata/md5-cache/gnome-extra/gnome-firmware-43.2
 2303261522 metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-46
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-50
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-53
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-16
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-44
-2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-30
-2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323-r1
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-52
-2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-55
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-54_p20221214
 2303261522 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603-r1
@@ -43929,8 +44048,6 @@
 2303261522 metadata/md5-cache/gnome-extra/nemo-5.6.1
 2303261522 metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
 2303261522 metadata/md5-cache/gnome-extra/nemo-fileroller-5.6.1
-2303261522 metadata/md5-cache/gnome-extra/pch-session-42.0-r1
-2303261522 metadata/md5-cache/gnome-extra/pch-session-43.2-r1
 2303261522 metadata/md5-cache/gnome-extra/synapse-0.2.99.4-r2
 2303262010 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-55
 2304020410 metadata/md5-cache/gnome-extra/evolution-data-server-3.46.4
@@ -43984,13 +44101,20 @@
 2304020410 metadata/md5-cache/gnome-extra/yelp-42.2-r1
 2304020410 metadata/md5-cache/gnome-extra/yelp-xsl-42.1
 2304020410 metadata/md5-cache/gnome-extra/zenity-3.44.0
-2304092140 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45
 2304092140 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-56
-2304171810 metadata/md5-cache/gnome-extra/Manifest.gz
 2304171810 metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-29.0
 2304171810 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20230408
 2304170410 metadata/md5-cache/gnome-extra/gucharmap-15.0.4
 2304170410 metadata/md5-cache/gnome-extra/nm-applet-1.32.0
+2304181840 metadata/md5-cache/gnome-extra/Manifest.gz
+2304181840 metadata/md5-cache/gnome-extra/gnome-firmware-43.2
+2304181740 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-16-r1
+2304181740 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-45
+2304181740 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-33
+2304181740 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-47.0.2
+2304181740 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20221024-r1
+2304181740 metadata/md5-cache/gnome-extra/pch-session-43.2-r1
+2304181740 metadata/md5-cache/gnome-extra/pch-session-44.0
 2303261522 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2303261522 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2303261522 metadata/md5-cache/gnustep-apps/batmon-0.8-r1
@@ -44424,12 +44548,10 @@
 2303261541 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.102.0
 2303261541 metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.104.0
 2303261541 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.102.0
-2303261541 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
 2303261541 metadata/md5-cache/kde-frameworks/oxygen-icons-5.102.0
 2303261541 metadata/md5-cache/kde-frameworks/oxygen-icons-5.104.0
 2304051141 metadata/md5-cache/kde-frameworks/kapidox-5.102.0
 2304051141 metadata/md5-cache/kde-frameworks/kapidox-5.104.0
-2304081740 metadata/md5-cache/kde-frameworks/Manifest.gz
 2304081740 metadata/md5-cache/kde-frameworks/attica-5.102.0
 2304081740 metadata/md5-cache/kde-frameworks/attica-5.104.0
 2304081740 metadata/md5-cache/kde-frameworks/attica-5.105.0
@@ -44660,6 +44782,8 @@
 2304081740 metadata/md5-cache/kde-frameworks/threadweaver-5.102.0
 2304081740 metadata/md5-cache/kde-frameworks/threadweaver-5.104.0
 2304081740 metadata/md5-cache/kde-frameworks/threadweaver-5.105.0
+2304200810 metadata/md5-cache/kde-frameworks/Manifest.gz
+2304200810 metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.104.0
 2303261541 metadata/md5-cache/kde-misc/bismuth-3.1.4
 2303261541 metadata/md5-cache/kde-misc/kshutdown-5.2
 2304081740 metadata/md5-cache/kde-misc/Manifest.gz
@@ -44729,7 +44853,6 @@
 2304081740 metadata/md5-cache/kde-plasma/kmenuedit-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/kpipewire-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/kscreen-5.26.5
-2304100210 metadata/md5-cache/kde-plasma/kscreen-5.27.4-r1
 2304081740 metadata/md5-cache/kde-plasma/kscreenlocker-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/kscreenlocker-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/ksshaskpass-5.26.5
@@ -44748,7 +44871,6 @@
 2304081740 metadata/md5-cache/kde-plasma/layer-shell-qt-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/layer-shell-qt-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/libkscreen-5.26.5
-2304100210 metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r1
 2304081740 metadata/md5-cache/kde-plasma/libksysguard-5.26.5-r1
 2304081740 metadata/md5-cache/kde-plasma/libksysguard-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/libkworkspace-5.26.5
@@ -44768,7 +44890,6 @@
 2304081740 metadata/md5-cache/kde-plasma/plasma-integration-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/plasma-integration-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/plasma-nm-5.26.5
-2304081740 metadata/md5-cache/kde-plasma/plasma-nm-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/plasma-pa-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/plasma-pa-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/plasma-sdk-5.26.5
@@ -44779,7 +44900,6 @@
 2304081740 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.27.4
 2304081740 metadata/md5-cache/kde-plasma/plasma-vault-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/plasma-vault-5.27.4.1
-2304081740 metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1
 2304081740 metadata/md5-cache/kde-plasma/plasma-workspace-5.26.5-r1
 2304081740 metadata/md5-cache/kde-plasma/plymouth-kcm-5.26.5
 2304081740 metadata/md5-cache/kde-plasma/plymouth-kcm-5.27.4.1
@@ -44799,8 +44919,12 @@
 2304130040 metadata/md5-cache/kde-plasma/kpipewire-5.27.4-r1
 2304130040 metadata/md5-cache/kde-plasma/kwin-5.27.4.1
 2304132140 metadata/md5-cache/kde-plasma/plasma-workspace-5.27.4.1-r2
-2304172040 metadata/md5-cache/kde-plasma/Manifest.gz
 2304172040 metadata/md5-cache/kde-plasma/plasma-firewall-5.27.4
+2304192310 metadata/md5-cache/kde-plasma/Manifest.gz
+2304182110 metadata/md5-cache/kde-plasma/kscreen-5.27.4-r2
+2304191540 metadata/md5-cache/kde-plasma/libkscreen-5.27.4-r2
+2304192210 metadata/md5-cache/kde-plasma/plasma-nm-5.27.4-r1
+2304192310 metadata/md5-cache/kde-plasma/plasma-welcome-5.27.4.1-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
 2107211809 metadata/md5-cache/lxde-base/lxinput-0.3.5-r2
@@ -44959,16 +45083,16 @@
 2303301110 metadata/md5-cache/mail-filter/zdkimfilter-3.15
 2304051141 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
 2304051141 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.3
-2304051141 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
 2304031010 metadata/md5-cache/mail-filter/maildrop-3.0.2
 2304051141 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
 2304032240 metadata/md5-cache/mail-filter/spamassassin-4.0.0-r1
 2304051141 metadata/md5-cache/mail-filter/spf-engine-2.9.3
 2304051141 metadata/md5-cache/mail-filter/spf-engine-3.0.3
 2304071910 metadata/md5-cache/mail-filter/procmail-3.22-r15
-2304091910 metadata/md5-cache/mail-filter/Manifest.gz
 2304091910 metadata/md5-cache/mail-filter/afew-3.0.1
 2304081840 metadata/md5-cache/mail-filter/maildrop-3.1.4
+2304191310 metadata/md5-cache/mail-filter/Manifest.gz
+2304191310 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.4
 2303261522 metadata/md5-cache/mail-mta/courier-1.1.5-r3
 2303261522 metadata/md5-cache/mail-mta/courier-1.1.8-r2
 2303261522 metadata/md5-cache/mail-mta/courier-1.2.2
@@ -44993,11 +45117,12 @@
 2304041210 metadata/md5-cache/mail-mta/notqmail-1.08-r6
 2304041210 metadata/md5-cache/mail-mta/notqmail-9999
 2304122010 metadata/md5-cache/mail-mta/courier-1.2.3-r1
-2304180040 metadata/md5-cache/mail-mta/Manifest.gz
 2304171610 metadata/md5-cache/mail-mta/postfix-3.8.0
 2304171610 metadata/md5-cache/mail-mta/postfix-3.9_pre20230416
 2304180040 metadata/md5-cache/mail-mta/proton-mail-bridge-2.3.0
 2304180040 metadata/md5-cache/mail-mta/proton-mail-bridge-3.0.21-r1
+2304201940 metadata/md5-cache/mail-mta/Manifest.gz
+2304201940 metadata/md5-cache/mail-mta/postfix-3.7.5
 2212170010 metadata/md5-cache/mate-base/mate-1.26.0
 2212170010 metadata/md5-cache/mate-base/mate-applets-meta-1.26.0
 2303261522 metadata/md5-cache/mate-base/mate-common-1.26.0
@@ -45349,7 +45474,6 @@
 2303261522 metadata/md5-cache/media-gfx/cropgui-0.6-r1
 2303261522 metadata/md5-cache/media-gfx/cropgui-0.6-r2
 2303261522 metadata/md5-cache/media-gfx/crwinfo-0.2
-2303261541 metadata/md5-cache/media-gfx/cura-4.13.1-r1
 2303261541 metadata/md5-cache/media-gfx/curaengine-4.13.1
 2303261522 metadata/md5-cache/media-gfx/curtail-1.3.1
 2303261541 metadata/md5-cache/media-gfx/darktable-4.2.1
@@ -45556,7 +45680,6 @@
 2304030910 metadata/md5-cache/media-gfx/imagemagick-7.1.0.62-r1
 2304021740 metadata/md5-cache/media-gfx/imagemagick-9999
 2304051141 metadata/md5-cache/media-gfx/mcomix-2.0.2-r1
-2304051141 metadata/md5-cache/media-gfx/mcomix-2.1.0
 2304051141 metadata/md5-cache/media-gfx/mcomix-9999
 2304051141 metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
 2304051141 metadata/md5-cache/media-gfx/mypaint-2.0.1-r3
@@ -45618,11 +45741,15 @@
 2304160640 metadata/md5-cache/media-gfx/blender-9999
 2304160340 metadata/md5-cache/media-gfx/gimp-2.99.14-r2
 2304160340 metadata/md5-cache/media-gfx/gimp-9999
-2304180340 metadata/md5-cache/media-gfx/Manifest.gz
 2304180340 metadata/md5-cache/media-gfx/asymptote-2.83
-2304180340 metadata/md5-cache/media-gfx/asymptote-2.85-r1
 2304180140 metadata/md5-cache/media-gfx/lximage-qt-1.3.0
 2304180340 metadata/md5-cache/media-gfx/openscad-2021.01-r4
+2304200810 metadata/md5-cache/media-gfx/Manifest.gz
+2304191510 metadata/md5-cache/media-gfx/asymptote-2.85-r1
+2304191840 metadata/md5-cache/media-gfx/cura-4.13.1-r1
+2304190040 metadata/md5-cache/media-gfx/feh-3.10
+2304200810 metadata/md5-cache/media-gfx/mcomix-2.1.0
+2304190040 metadata/md5-cache/media-gfx/superslicer-2.5.59.2
 2012270139 metadata/md5-cache/media-libs/cimg-2.9.3
 2106251539 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
 1911150539 metadata/md5-cache/media-libs/icc-profiles-basiccolor-printing2009-1.2.0
@@ -45924,7 +46051,6 @@
 2303261522 metadata/md5-cache/media-libs/libnsbmp-0.1.6-r1
 2303261522 metadata/md5-cache/media-libs/libnsgif-0.2.1-r3
 2303261522 metadata/md5-cache/media-libs/libnspsl-0.1.6-r1
-2303261522 metadata/md5-cache/media-libs/libofa-0.9.3-r3
 2303261522 metadata/md5-cache/media-libs/libogg-1.3.5-r1
 2303261522 metadata/md5-cache/media-libs/liboggz-1.1.1
 2303261522 metadata/md5-cache/media-libs/libopenaptx-0.2.0-r1
@@ -45994,7 +46120,6 @@
 2303261522 metadata/md5-cache/media-libs/libvisio-0.1.7
 2303261522 metadata/md5-cache/media-libs/libvisio-9999
 2303261522 metadata/md5-cache/media-libs/libvisual-0.4.1
-2303261522 metadata/md5-cache/media-libs/libvisual-0.4.2
 2303261522 metadata/md5-cache/media-libs/libvmaf-2.3.0-r2
 2303261522 metadata/md5-cache/media-libs/libvorbis-1.3.7-r1
 2303261522 metadata/md5-cache/media-libs/libvpx-1.12.0-r1
@@ -46069,8 +46194,6 @@
 2303261522 metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122-r1
 2303261522 metadata/md5-cache/media-libs/rtaudio-5.2.0
 2303261541 metadata/md5-cache/media-libs/rtmidi-5.0.0
-2303261522 metadata/md5-cache/media-libs/rubberband-3.1.1-r1
-2303261522 metadata/md5-cache/media-libs/rubberband-3.1.2
 2303261522 metadata/md5-cache/media-libs/sbc-2.0
 2303261522 metadata/md5-cache/media-libs/sdl-gfx-2.0.26-r1
 2303261522 metadata/md5-cache/media-libs/sdl-image-1.2.12_p20220527-r1
@@ -46192,7 +46315,6 @@
 2304051640 metadata/md5-cache/media-libs/kvazaar-9999
 2304020410 metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
 2304020410 metadata/md5-cache/media-libs/libchamplain-0.12.21
-2304051610 metadata/md5-cache/media-libs/libdiscid-0.6.4
 2304020410 metadata/md5-cache/media-libs/libmatemixer-1.26.0
 2304020410 metadata/md5-cache/media-libs/libmediaart-1.9.6-r1
 2304051740 metadata/md5-cache/media-libs/libmodplug-0.8.9.1
@@ -46260,7 +46382,6 @@
 2304161540 metadata/md5-cache/media-libs/portmidi-234-r2
 2304161540 metadata/md5-cache/media-libs/sdl2-mixer-2.6.3
 2304161540 metadata/md5-cache/media-libs/sdl2-ttf-2.20.2
-2304180810 metadata/md5-cache/media-libs/Manifest.gz
 2304170240 metadata/md5-cache/media-libs/libass-0.17.1
 2304180040 metadata/md5-cache/media-libs/libplacebo-5.264.1
 2304170440 metadata/md5-cache/media-libs/libva-2.18.0-r1
@@ -46272,6 +46393,12 @@
 2304180310 metadata/md5-cache/media-libs/vulkan-loader-1.3.243
 2304170440 metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
 2304170440 metadata/md5-cache/media-libs/xine-lib-1.2.9999
+2304201910 metadata/md5-cache/media-libs/Manifest.gz
+2304201410 metadata/md5-cache/media-libs/libdiscid-0.6.4
+2304201410 metadata/md5-cache/media-libs/libofa-0.9.3-r3
+2304191740 metadata/md5-cache/media-libs/libvisual-0.4.2-r1
+2304201910 metadata/md5-cache/media-libs/opus-1.4
+2304191440 metadata/md5-cache/media-libs/rubberband-3.1.2
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2107201909 metadata/md5-cache/media-plugins/hexter-1.1.1
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
@@ -46725,7 +46852,6 @@
 2303261541 metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
 2303261522 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r3
 2303261522 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.1
-2303261522 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2
 2303261541 metadata/md5-cache/media-plugins/libvisual-projectm-2.1.1
 2303261522 metadata/md5-cache/media-plugins/live-2021.08.24
 2303261522 metadata/md5-cache/media-plugins/mcp-plugins-0.4.0-r1
@@ -46861,8 +46987,9 @@
 2304061910 metadata/md5-cache/media-plugins/vdr-xineliboutput-9999
 2304061910 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
 2304100810 metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.5
-2304110010 metadata/md5-cache/media-plugins/Manifest.gz
 2304110010 metadata/md5-cache/media-plugins/grilo-plugins-0.3.16
+2304191310 metadata/md5-cache/media-plugins/Manifest.gz
+2304191310 metadata/md5-cache/media-plugins/libvisual-plugins-0.4.2
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
 2004131239 metadata/md5-cache/media-radio/dxcc-20191204
@@ -47112,7 +47239,6 @@
 2303261541 metadata/md5-cache/media-sound/lmms-9999
 2303261522 metadata/md5-cache/media-sound/lollypop-1.4.29
 2303261522 metadata/md5-cache/media-sound/lollypop-1.4.35
-2303261522 metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
 2303261522 metadata/md5-cache/media-sound/madplay-0.15.2b-r2
 2303261522 metadata/md5-cache/media-sound/mangler-1.2.5-r3
 2303261522 metadata/md5-cache/media-sound/mcdp-0.4b
@@ -47274,7 +47400,6 @@
 2303261522 metadata/md5-cache/media-sound/wavsplit-1.2.1-r2
 2303261541 metadata/md5-cache/media-sound/wildmidi-0.4.5
 2303261522 metadata/md5-cache/media-sound/xfmpc-0.3.0
-2303261522 metadata/md5-cache/media-sound/xmms2-0.9.2
 2303261522 metadata/md5-cache/media-sound/xwax-1.8
 2303261541 metadata/md5-cache/media-sound/yarock-1.4.0-r3
 2303261541 metadata/md5-cache/media-sound/yoshimi-2.2.3
@@ -47343,16 +47468,18 @@
 2304151240 metadata/md5-cache/media-sound/snapcast-0.27.0
 2304161910 metadata/md5-cache/media-sound/openmpt123-0.6.10
 2304161540 metadata/md5-cache/media-sound/timidity-freepats-20060219-r1
-2304180340 metadata/md5-cache/media-sound/Manifest.gz
 2304180340 metadata/md5-cache/media-sound/lilypond-2.22.0-r1
 2304180340 metadata/md5-cache/media-sound/lilypond-2.22.1-r1
 2304180340 metadata/md5-cache/media-sound/lilypond-2.23.0-r1
 2304180340 metadata/md5-cache/media-sound/lilypond-2.23.2-r1
-2304180340 metadata/md5-cache/media-sound/lilypond-2.24.0
 2304180340 metadata/md5-cache/media-sound/lilypond-9999
 2304180140 metadata/md5-cache/media-sound/pavucontrol-qt-1.3.0
 2304170340 metadata/md5-cache/media-sound/rhythmbox-3.4.7
 2304180340 metadata/md5-cache/media-sound/timidity++-2.15.0-r6
+2304201410 metadata/md5-cache/media-sound/Manifest.gz
+2304200710 metadata/md5-cache/media-sound/lilypond-2.24.0
+2304201410 metadata/md5-cache/media-sound/mac-4.11.4.5.7-r1
+2304201410 metadata/md5-cache/media-sound/xmms2-0.9.2
 1806021308 metadata/md5-cache/media-tv/ivtvplayer-0.1.3-r2
 2110221139 metadata/md5-cache/media-tv/shoutcast2vdr-0.0.8-r1
 2012172009 metadata/md5-cache/media-tv/w_scan-20170107
@@ -47475,7 +47602,6 @@
 2303261522 metadata/md5-cache/media-video/mkclean-0.8.10
 2303261522 metadata/md5-cache/media-video/mkvalidator-0.5.2
 2303261522 metadata/md5-cache/media-video/mkvtoolnix-72.0.0
-2303261522 metadata/md5-cache/media-video/mkvtoolnix-9999
 2303261522 metadata/md5-cache/media-video/motion-4.3.2-r1
 2303261522 metadata/md5-cache/media-video/motion-4.5.1
 2303261522 metadata/md5-cache/media-video/motiontrack-0.1.3-r2
@@ -47571,7 +47697,6 @@
 2304020410 metadata/md5-cache/media-video/totem-43.0
 2304051141 metadata/md5-cache/media-video/vcsi-7.0.13-r1
 2304051141 metadata/md5-cache/media-video/vidcutter-6.0.5.1-r2
-2304051141 metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201
 2304051141 metadata/md5-cache/media-video/vidcutter-9999
 2304051141 metadata/md5-cache/media-video/vidify-2.2.6-r3
 2304051141 metadata/md5-cache/media-video/vidify-audiosync-0.3.0-r1
@@ -47606,15 +47731,18 @@
 2304150910 metadata/md5-cache/media-video/mediainfo-22.09
 2304150910 metadata/md5-cache/media-video/mediainfo-23.03
 2304161040 metadata/md5-cache/media-video/droidcam-2.0.0-r1
-2304181440 metadata/md5-cache/media-video/Manifest.gz
 2304180310 metadata/md5-cache/media-video/cheese-44.0.1
 2304181440 metadata/md5-cache/media-video/pipewire-0.3.69-r1
+2304201610 metadata/md5-cache/media-video/Manifest.gz
+2304190140 metadata/md5-cache/media-video/mkvtoolnix-75.0.0
+2304190140 metadata/md5-cache/media-video/mkvtoolnix-9999
+2304201610 metadata/md5-cache/media-video/pipewire-0.3.70
+2304191510 metadata/md5-cache/media-video/vidcutter-6.0.5.1_p20230201
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 2104031909 metadata/md5-cache/net-analyzer/bwbar-1.2.3
 2008201139 metadata/md5-cache/net-analyzer/calamaris-2.99.4.5
 2108110340 metadata/md5-cache/net-analyzer/etherape-0.9.20
 2011271209 metadata/md5-cache/net-analyzer/firewalk-5.0-r2
-2106030210 metadata/md5-cache/net-analyzer/flowgrind-0.8.0-r2
 2110212239 metadata/md5-cache/net-analyzer/ftester-1.0
 2107160439 metadata/md5-cache/net-analyzer/ibmonitor-1.4-r1
 2103162239 metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
@@ -47635,7 +47763,6 @@
 2106032239 metadata/md5-cache/net-analyzer/squid-graph-3.2-r2
 2104032309 metadata/md5-cache/net-analyzer/tsung-1.7.0
 2112021009 metadata/md5-cache/net-analyzer/testssl-3.0.5
-2112100710 metadata/md5-cache/net-analyzer/flowgrind-0.8.2
 2112141939 metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4-r1
 2201120040 metadata/md5-cache/net-analyzer/sqlninja-0.2.6_p1-r1
 2201231639 metadata/md5-cache/net-analyzer/mrtg-ping-probe-2.2.0-r1
@@ -47725,7 +47852,6 @@
 2303261522 metadata/md5-cache/net-analyzer/httping-2.5
 2303261522 metadata/md5-cache/net-analyzer/hunt-1.5_p6_p1
 2303261522 metadata/md5-cache/net-analyzer/hydra-9.4
-2303261541 metadata/md5-cache/net-analyzer/icinga2-2.13.6-r1
 2303261541 metadata/md5-cache/net-analyzer/icinga2-2.13.7
 2303261541 metadata/md5-cache/net-analyzer/icinga2-9999
 2303261522 metadata/md5-cache/net-analyzer/ifstat-1.1-r2
@@ -47916,10 +48042,6 @@
 2304051141 metadata/md5-cache/net-analyzer/graphite-web-1.1.8-r3
 2304030840 metadata/md5-cache/net-analyzer/gvm-libs-21.4.4-r3
 2304051141 metadata/md5-cache/net-analyzer/linkchecker-10.1.0
-2304051141 metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r1
-2304051141 metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2
-2304051141 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r2
-2304051141 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3
 2304051141 metadata/md5-cache/net-analyzer/nagstamon-3.10.1
 2304051141 metadata/md5-cache/net-analyzer/nagstamon-3.8.0
 2304051141 metadata/md5-cache/net-analyzer/net-snmp-5.9.3-r1
@@ -47961,7 +48083,6 @@
 2304142310 metadata/md5-cache/net-analyzer/dnsenum-1.2.2
 2304142310 metadata/md5-cache/net-analyzer/dnsenum-1.3.1
 2304151240 metadata/md5-cache/net-analyzer/tcpflow-1.6.1-r1
-2304180040 metadata/md5-cache/net-analyzer/Manifest.gz
 2304180040 metadata/md5-cache/net-analyzer/chronograf-1.8.5
 2304171510 metadata/md5-cache/net-analyzer/linkchecker-10.2.1
 2304171510 metadata/md5-cache/net-analyzer/monitoring-plugins-2.3.3-r1
@@ -47977,6 +48098,11 @@
 2304180040 metadata/md5-cache/net-analyzer/zabbix-6.0.16
 2304180040 metadata/md5-cache/net-analyzer/zabbix-6.4.0
 2304180040 metadata/md5-cache/net-analyzer/zabbix-6.4.1
+2304201910 metadata/md5-cache/net-analyzer/Manifest.gz
+2304190940 metadata/md5-cache/net-analyzer/flowgrind-0.8.2
+2304191540 metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1-r2
+2304191540 metadata/md5-cache/net-analyzer/nagios-icinga-openvpn-0.0.1-r3
+2304200810 metadata/md5-cache/net-analyzer/sngrep-1.7.0
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2205171510 metadata/md5-cache/net-dialup/ppp-scripts-0
 2209170112 metadata/md5-cache/net-dialup/isdn-firmware-2011.8.29.8.37
@@ -47985,17 +48111,11 @@
 2303261541 metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
 2303261522 metadata/md5-cache/net-dialup/dial-1.2-r2
 2303261522 metadata/md5-cache/net-dialup/dwun-0.96e-r6
-2303261522 metadata/md5-cache/net-dialup/freeradius-3.0.25-r2
-2303261522 metadata/md5-cache/net-dialup/freeradius-3.0.26
-2303261522 metadata/md5-cache/net-dialup/freeradius-3.2.0
-2303261522 metadata/md5-cache/net-dialup/freeradius-3.2.1
 2303261522 metadata/md5-cache/net-dialup/freeradius-client-1.1.7-r3
 2303261522 metadata/md5-cache/net-dialup/kpnadsl4linux-1.11
 2303261522 metadata/md5-cache/net-dialup/lrzsz-0.12.20-r5
 2303261522 metadata/md5-cache/net-dialup/mgetty-1.2.1-r4
 2303261522 metadata/md5-cache/net-dialup/mingetty-1.08-r3
-2303261522 metadata/md5-cache/net-dialup/minicom-2.8-r1
-2303261522 metadata/md5-cache/net-dialup/minicom-2.8-r2
 2303261522 metadata/md5-cache/net-dialup/mwavem-2.0-r2
 2303261522 metadata/md5-cache/net-dialup/neocon-20110228
 2303261522 metadata/md5-cache/net-dialup/picocom-3.1
@@ -48016,8 +48136,9 @@
 2303290513 metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
 2304012010 metadata/md5-cache/net-dialup/freeradius-3.2.2
 2304020410 metadata/md5-cache/net-dialup/moserial-3.0.21
-2304142040 metadata/md5-cache/net-dialup/Manifest.gz
 2304142040 metadata/md5-cache/net-dialup/ppp-2.5.0
+2304200710 metadata/md5-cache/net-dialup/Manifest.gz
+2304191440 metadata/md5-cache/net-dialup/minicom-2.8-r2
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 2105311239 metadata/md5-cache/net-dns/idnkit-2.3
 2103050209 metadata/md5-cache/net-dns/totd-1.5.1
@@ -48041,7 +48162,6 @@
 2303261522 metadata/md5-cache/net-dns/dnrd-2.20.3-r3
 2303261522 metadata/md5-cache/net-dns/dnsdist-1.5.1-r101
 2303261522 metadata/md5-cache/net-dns/dnsdist-1.6.1-r1
-2303261522 metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
 2303261522 metadata/md5-cache/net-dns/dnsmasq-2.85
 2303261522 metadata/md5-cache/net-dns/dnsmasq-2.86-r1
 2303261522 metadata/md5-cache/net-dns/dnsmasq-2.87
@@ -48091,7 +48211,6 @@
 2304071510 metadata/md5-cache/net-dns/bind-tools-9.16.39
 2304151610 metadata/md5-cache/net-dns/openresolv-3.13.0
 2304161940 metadata/md5-cache/net-dns/knot-3.2.2
-2304180340 metadata/md5-cache/net-dns/Manifest.gz
 2304180040 metadata/md5-cache/net-dns/coredns-1.10.0
 2304180040 metadata/md5-cache/net-dns/coredns-1.10.1
 2304180040 metadata/md5-cache/net-dns/coredns-1.9.3
@@ -48101,6 +48220,8 @@
 2304180040 metadata/md5-cache/net-dns/dnscrypt-proxy-9999
 2304180340 metadata/md5-cache/net-dns/libidn-1.41
 2304172340 metadata/md5-cache/net-dns/pdns-4.7.4
+2304190340 metadata/md5-cache/net-dns/Manifest.gz
+2304190340 metadata/md5-cache/net-dns/dnsdist-1.7.3-r1
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2303261522 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -48175,9 +48296,10 @@
 2303290513 metadata/md5-cache/net-fs/samba-4.17.5
 2303290513 metadata/md5-cache/net-fs/samba-4.18.0
 2304011940 metadata/md5-cache/net-fs/samba-4.16.8
-2304180040 metadata/md5-cache/net-fs/Manifest.gz
 2304180040 metadata/md5-cache/net-fs/mc-2021.03.23.05.46.11
 2304180040 metadata/md5-cache/net-fs/minio-2021.04.18.19.26.29-r2
+2304200810 metadata/md5-cache/net-fs/Manifest.gz
+2304200810 metadata/md5-cache/net-fs/nfs-utils-2.6.3
 2204111309 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2208111710 metadata/md5-cache/net-ftp/tnftp-20210827
 2208111710 metadata/md5-cache/net-ftp/uftpd-2.15
@@ -48205,8 +48327,8 @@
 2303261522 metadata/md5-cache/net-ftp/yafc-1.3.7-r1
 2303261522 metadata/md5-cache/net-ftp/yafc-1.3.7-r2
 2303311810 metadata/md5-cache/net-ftp/filezilla-3.63.2.1
-2304020410 metadata/md5-cache/net-ftp/Manifest.gz
-2304020410 metadata/md5-cache/net-ftp/gftp-2.9.1b
+2304182140 metadata/md5-cache/net-ftp/Manifest.gz
+2304182140 metadata/md5-cache/net-ftp/gftp-2.9.1b
 2011142339 metadata/md5-cache/net-im/librvp-0.9.7
 2111141709 metadata/md5-cache/net-im/telepathy-connection-managers-2-r2
 1912201239 metadata/md5-cache/net-im/tkabber-1.1.2
@@ -48281,7 +48403,6 @@
 2304051141 metadata/md5-cache/net-im/yowsup-3.3.0
 2304031910 metadata/md5-cache/net-im/zoom-5.14.2.2046
 2304061910 metadata/md5-cache/net-im/discord-0.0.26-r1
-2304061910 metadata/md5-cache/net-im/element-desktop-bin-1.11.23
 2304061910 metadata/md5-cache/net-im/gitter-bin-4.1.0-r1
 2304061910 metadata/md5-cache/net-im/gitter-bin-5.0.1
 2304061910 metadata/md5-cache/net-im/gitter-bin-5.0.1-r1
@@ -48299,12 +48420,13 @@
 2304140710 metadata/md5-cache/net-im/cawbird-1.5-r3
 2304130810 metadata/md5-cache/net-im/signal-desktop-bin-6.14.0
 2304150240 metadata/md5-cache/net-im/skypeforlinux-8.96.0.408
-2304172340 metadata/md5-cache/net-im/Manifest.gz
 2304170410 metadata/md5-cache/net-im/gajim-1.4.7-r2
 2304162310 metadata/md5-cache/net-im/neochat-23.03.90
 2304171240 metadata/md5-cache/net-im/synapse-1.79.0
 2304172340 metadata/md5-cache/net-im/telegram-desktop-4.7.1
 2304162310 metadata/md5-cache/net-im/tokodon-23.03.90
+2304200140 metadata/md5-cache/net-im/Manifest.gz
+2304200140 metadata/md5-cache/net-im/element-desktop-bin-1.11.29
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
 2008302209 metadata/md5-cache/net-irc/znc-igloo-push-20200520
@@ -48363,7 +48485,6 @@
 2303261522 metadata/md5-cache/net-irc/sic-1.2-r1
 2303261522 metadata/md5-cache/net-irc/telepathy-idle-0.2.2
 2303261522 metadata/md5-cache/net-irc/unrealircd-5.2.4-r1
-2303261522 metadata/md5-cache/net-irc/unrealircd-6.0.4.2
 2303261541 metadata/md5-cache/net-irc/weechat-3.7.1
 2303261541 metadata/md5-cache/net-irc/weechat-9999
 2303261541 metadata/md5-cache/net-irc/znc-1.8.2-r2
@@ -48383,10 +48504,11 @@
 2304110110 metadata/md5-cache/net-irc/atheme-services-7.2.12-r4
 2304121310 metadata/md5-cache/net-irc/irssi-1.4.4
 2304120512 metadata/md5-cache/net-irc/irssi-9999
-2304180040 metadata/md5-cache/net-irc/Manifest.gz
 2304180040 metadata/md5-cache/net-irc/ergo-2.11.1
 2304180040 metadata/md5-cache/net-irc/soju-0.5.2
 2304180040 metadata/md5-cache/net-irc/soju-0.6.0
+2304191010 metadata/md5-cache/net-irc/Manifest.gz
+2304191010 metadata/md5-cache/net-irc/unrealircd-6.0.4.2
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
 1903300009 metadata/md5-cache/net-libs/freaklabs-chibiarduino-1.0.8_p20190329
@@ -48454,13 +48576,11 @@
 2303261541 metadata/md5-cache/net-libs/grpc-1.52.1
 2303261522 metadata/md5-cache/net-libs/gsoap-2.8.114-r1
 2303261522 metadata/md5-cache/net-libs/http-parser-2.9.4-r2
-2303261541 metadata/md5-cache/net-libs/ignition-msgs-5.9.0
 2303261541 metadata/md5-cache/net-libs/ignition-transport-8.3.0
 2303261541 metadata/md5-cache/net-libs/kdsoap-2.1.1
 2303261522 metadata/md5-cache/net-libs/ldns-1.8.0-r4
 2303261522 metadata/md5-cache/net-libs/ldns-1.8.1
 2303261522 metadata/md5-cache/net-libs/ldns-1.8.3
-2303261522 metadata/md5-cache/net-libs/ldns-1.8.3-r1
 2303261522 metadata/md5-cache/net-libs/libaccounts-glib-1.26-r1
 2303261541 metadata/md5-cache/net-libs/libad9361-iio-0.2-r1
 2303261541 metadata/md5-cache/net-libs/libad9361-iio-9999
@@ -48715,13 +48835,15 @@
 2304150910 metadata/md5-cache/net-libs/aqbanking-6.5.3-r1
 2304161940 metadata/md5-cache/net-libs/ngtcp2-0.14.1
 2304161010 metadata/md5-cache/net-libs/xdp-tools-1.3.1-r3
-2304172310 metadata/md5-cache/net-libs/Manifest.gz
 2304170410 metadata/md5-cache/net-libs/farstream-0.2.9-r1
 2304162310 metadata/md5-cache/net-libs/libhtp-0.5.43
 2304172040 metadata/md5-cache/net-libs/nodejs-18.16.0
 2304172310 metadata/md5-cache/net-libs/webkit-gtk-2.40.0
 2304172310 metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r410
 2304172310 metadata/md5-cache/net-libs/webkit-gtk-2.40.0-r600
+2304191440 metadata/md5-cache/net-libs/Manifest.gz
+2304181640 metadata/md5-cache/net-libs/ignition-msgs-5.11.0
+2304191440 metadata/md5-cache/net-libs/ldns-1.8.3-r1
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
 2007210509 metadata/md5-cache/net-mail/autorespond-2.0.5
 2111060309 metadata/md5-cache/net-mail/imapsync-1.977
@@ -48841,13 +48963,15 @@
 2304071610 metadata/md5-cache/net-mail/isync-1.4.4-r1
 2304071610 metadata/md5-cache/net-mail/isync-9999
 2304101210 metadata/md5-cache/net-mail/mailshears-0.0.5
-2304180340 metadata/md5-cache/net-mail/Manifest.gz
 2304180340 metadata/md5-cache/net-mail/mailutils-3.15
 2304180340 metadata/md5-cache/net-mail/mu-1.10.2
 2304180340 metadata/md5-cache/net-mail/mu-1.8.14
 2304180340 metadata/md5-cache/net-mail/notmuch-0.32.2-r1
 2304180340 metadata/md5-cache/net-mail/notmuch-0.37
 2304180340 metadata/md5-cache/net-mail/notmuch-0.37-r1
+2304201940 metadata/md5-cache/net-mail/Manifest.gz
+2304201940 metadata/md5-cache/net-mail/dovecot-2.3.20-r2
+2304192110 metadata/md5-cache/net-mail/mu-1.10.3
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
 2108291210 metadata/md5-cache/net-misc/autossh-1.4g
@@ -48986,7 +49110,6 @@
 2303261522 metadata/md5-cache/net-misc/dleyna-server-0.7.2
 2303261522 metadata/md5-cache/net-misc/dropbear-2022.83
 2303261522 metadata/md5-cache/net-misc/dropbox-cli-2022
-2303261522 metadata/md5-cache/net-misc/dropbox-cli-2023
 2303261522 metadata/md5-cache/net-misc/econnman-1.1_p20160305
 2303261522 metadata/md5-cache/net-misc/efax-0.9a_p19_p1
 2303261522 metadata/md5-cache/net-misc/endlessh-1.1-r2
@@ -49317,9 +49440,7 @@
 2304051141 metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.5_p1
 2304051141 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
 2304020410 metadata/md5-cache/net-misc/rygel-0.42.1
-2304030110 metadata/md5-cache/net-misc/rygel-0.42.2
 2304051141 metadata/md5-cache/net-misc/s3cmd-2.2.0
-2304051141 metadata/md5-cache/net-misc/s3cmd-2.3.0
 2304051141 metadata/md5-cache/net-misc/s4cmd-2.1.0
 2304051141 metadata/md5-cache/net-misc/s4cmd-2.1.0-r1
 2304051141 metadata/md5-cache/net-misc/socket-burst-dampener-1.3.1-r1
@@ -49358,18 +49479,14 @@
 2304131210 metadata/md5-cache/net-misc/nextcloud-client-3.8.0
 2304130910 metadata/md5-cache/net-misc/streamlink-5.3.1
 2304130710 metadata/md5-cache/net-misc/streamlink-5.4.0
-2304151610 metadata/md5-cache/net-misc/icaclient-23.3.0.32
 2304151610 metadata/md5-cache/net-misc/r8125-9.008.00
 2304151610 metadata/md5-cache/net-misc/r8125-9.009.01
 2304151610 metadata/md5-cache/net-misc/r8125-9.009.02
 2304151610 metadata/md5-cache/net-misc/r8125-9.011.00
-2304142310 metadata/md5-cache/net-misc/tigervnc-1.13.1
-2304142310 metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
 2304161110 metadata/md5-cache/net-misc/dhcpcd-10.0.0
 2304161110 metadata/md5-cache/net-misc/dhcpcd-9.5.0
 2304161110 metadata/md5-cache/net-misc/dhcpcd-9999
 2304160010 metadata/md5-cache/net-misc/gallery-dl-1.25.2
-2304181010 metadata/md5-cache/net-misc/Manifest.gz
 2304180040 metadata/md5-cache/net-misc/croc-9.6.0
 2304180040 metadata/md5-cache/net-misc/croc-9.6.2
 2304180040 metadata/md5-cache/net-misc/drive-0.4.0_p20210208
@@ -49388,6 +49505,15 @@
 2304180740 metadata/md5-cache/net-misc/trurl-0.5
 2304180740 metadata/md5-cache/net-misc/trurl-9999
 2304180040 metadata/md5-cache/net-misc/websocketd-0.4.1
+2304201640 metadata/md5-cache/net-misc/Manifest.gz
+2304191440 metadata/md5-cache/net-misc/dropbox-cli-2023
+2304190940 metadata/md5-cache/net-misc/electrum-4.4.0
+2304201640 metadata/md5-cache/net-misc/icaclient-23.3.0.32-r1
+2304191810 metadata/md5-cache/net-misc/rygel-0.42.2-r1
+2304201540 metadata/md5-cache/net-misc/rygel-0.42.2-r2
+2304200710 metadata/md5-cache/net-misc/s3cmd-2.3.0
+2304191310 metadata/md5-cache/net-misc/tigervnc-1.13.1
+2304191310 metadata/md5-cache/net-misc/tigervnc-xorg-module-1.13.1
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2204240440 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2209170910 metadata/md5-cache/net-nds/gssproxy-0.9.1
@@ -49413,7 +49539,6 @@
 2104040109 metadata/md5-cache/net-news/yydecode-0.2.10-r1
 2203040410 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2303261522 metadata/md5-cache/net-news/liferea-1.12.10
-2303261522 metadata/md5-cache/net-news/liferea-1.12.9-r2
 2303261522 metadata/md5-cache/net-news/newsboat-2.21-r1
 2303261522 metadata/md5-cache/net-news/newsboat-2.23-r1
 2303261522 metadata/md5-cache/net-news/newsboat-2.28
@@ -49432,8 +49557,8 @@
 2304042010 metadata/md5-cache/net-news/rssguard-4.3.2
 2304120512 metadata/md5-cache/net-news/rssguard-4.3.3
 2304140440 metadata/md5-cache/net-news/liferea-1.14.5
-2304151040 metadata/md5-cache/net-news/Manifest.gz
 2304151040 metadata/md5-cache/net-news/sfeed-1.6
+2304190740 metadata/md5-cache/net-news/Manifest.gz
 2109091440 metadata/md5-cache/net-nntp/slrn-1.0.3-r1
 2210140540 metadata/md5-cache/net-nntp/leafnode-1.11.11-r1
 2303261522 metadata/md5-cache/net-nntp/Manifest.gz
@@ -49679,7 +49804,6 @@
 2303290513 metadata/md5-cache/net-vpn/openvpn-2.5.6-r1
 2303290513 metadata/md5-cache/net-vpn/openvpn-2.5.7-r1
 2303290513 metadata/md5-cache/net-vpn/openvpn-9999
-2303290513 metadata/md5-cache/net-vpn/strongswan-5.9.10
 2303290513 metadata/md5-cache/net-vpn/strongswan-5.9.8
 2303290513 metadata/md5-cache/net-vpn/vpnc-0.5.3_p20220927-r1
 2303290513 metadata/md5-cache/net-vpn/vpnc-9999
@@ -49703,7 +49827,6 @@
 2304101410 metadata/md5-cache/net-vpn/i2pd-2.47.0
 2304101140 metadata/md5-cache/net-vpn/vtun-3.0.4-r3
 2304142240 metadata/md5-cache/net-vpn/i2pd-2.46.1
-2304180940 metadata/md5-cache/net-vpn/Manifest.gz
 2304180040 metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
 2304180040 metadata/md5-cache/net-vpn/frp-0.42.0
 2304180040 metadata/md5-cache/net-vpn/frp-0.43.0
@@ -49717,6 +49840,8 @@
 2304180040 metadata/md5-cache/net-vpn/riseup-vpn-0.21.11_p20221113
 2304180040 metadata/md5-cache/net-vpn/tailscale-1.36.2
 2304180040 metadata/md5-cache/net-vpn/tailscale-1.38.4
+2304190840 metadata/md5-cache/net-vpn/Manifest.gz
+2304190840 metadata/md5-cache/net-vpn/strongswan-5.9.10
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
 1905080439 metadata/md5-cache/net-wireless/portapack-firmware-20190405
@@ -49763,7 +49888,6 @@
 2303261522 metadata/md5-cache/net-wireless/iw-5.9
 2303261522 metadata/md5-cache/net-wireless/iwgtk-0.9
 2303261522 metadata/md5-cache/net-wireless/kismet-2022.08.1-r1
-2303261522 metadata/md5-cache/net-wireless/kismet-2022.08.1-r2
 2303261522 metadata/md5-cache/net-wireless/kismet-9999
 2303261522 metadata/md5-cache/net-wireless/kismetmobiledashboard-9999
 2303261541 metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518-r1
@@ -49815,7 +49939,6 @@
 2303261522 metadata/md5-cache/net-wireless/unifi-7.3.83
 2303261522 metadata/md5-cache/net-wireless/wepattack-0.1.3-r5
 2303261522 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
-2303290513 metadata/md5-cache/net-wireless/bluez-5.65-r1
 2303290513 metadata/md5-cache/net-wireless/bluez-5.66-r1
 2303290513 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r6
 2303290513 metadata/md5-cache/net-wireless/iwd-2.4
@@ -49858,7 +49981,6 @@
 2304050310 metadata/md5-cache/net-wireless/gr-scopy-0.0_p20220602
 2304050310 metadata/md5-cache/net-wireless/gr-scopy-9999
 2304051141 metadata/md5-cache/net-wireless/lorcon-0.0_p20200214
-2304051141 metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2
 2304051141 metadata/md5-cache/net-wireless/lorcon-9999
 2304051141 metadata/md5-cache/net-wireless/nanovna-saver-0.5.4
 2304051141 metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -49872,8 +49994,10 @@
 2304051141 metadata/md5-cache/net-wireless/urh-9999
 2304061910 metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
 2304061910 metadata/md5-cache/net-wireless/sdrplay-3.07.1
-2304092340 metadata/md5-cache/net-wireless/Manifest.gz
 2304092310 metadata/md5-cache/net-wireless/ubertooth-2020.12.1-r1
+2304191440 metadata/md5-cache/net-wireless/Manifest.gz
+2304191440 metadata/md5-cache/net-wireless/kismet-2022.08.1-r2
+2304191340 metadata/md5-cache/net-wireless/lorcon-2020.06.06_p20220216-r2
 2303261522 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2303261522 metadata/md5-cache/perl-core/Compress-Raw-Zlib-2.202.0
 2303261522 metadata/md5-cache/perl-core/Encode-3.120.0
@@ -50110,7 +50234,6 @@
 2303261522 metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
 2303261522 metadata/md5-cache/sci-chemistry/dssp-2.2.1-r3
 2303261522 metadata/md5-cache/sci-chemistry/dssp-3.0.11
-2303261541 metadata/md5-cache/sci-chemistry/dssp-4.2.0
 2303261541 metadata/md5-cache/sci-chemistry/dssp-4.2.2.1
 2303261522 metadata/md5-cache/sci-chemistry/easychem-0.6-r1
 2303261522 metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
@@ -50172,9 +50295,11 @@
 2304071910 metadata/md5-cache/sci-chemistry/tinker-8.2.1
 2304141640 metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
 2304141640 metadata/md5-cache/sci-chemistry/mdtraj-1.9.7
-2304180040 metadata/md5-cache/sci-chemistry/Manifest.gz
 2304171810 metadata/md5-cache/sci-chemistry/chemex-2022.3.1
 2304180040 metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.95_pre20171122
+2304201640 metadata/md5-cache/sci-chemistry/Manifest.gz
+2304191610 metadata/md5-cache/sci-chemistry/chemex-2022.3.3
+2304201640 metadata/md5-cache/sci-chemistry/chemex-2022.3.4
 1702282330 metadata/md5-cache/sci-electronics/freehdl-0.0.8
 2003201239 metadata/md5-cache/sci-electronics/geda-suite-20171223-r1
 2108222309 metadata/md5-cache/sci-electronics/irsim-9.7.93
@@ -50207,9 +50332,7 @@
 2303261522 metadata/md5-cache/sci-electronics/gwave-20190116
 2303261522 metadata/md5-cache/sci-electronics/iverilog-10.3
 2303261522 metadata/md5-cache/sci-electronics/iverilog-11.0
-2303261541 metadata/md5-cache/sci-electronics/kicad-6.0.9
 2303261541 metadata/md5-cache/sci-electronics/kicad-7.0.0-r1
-2303261541 metadata/md5-cache/sci-electronics/kicad-9999
 2303261541 metadata/md5-cache/sci-electronics/kicad-footprints-6.0.9
 2303261541 metadata/md5-cache/sci-electronics/kicad-footprints-7.0.0
 2303261541 metadata/md5-cache/sci-electronics/kicad-footprints-9999
@@ -50254,12 +50377,26 @@
 2304040010 metadata/md5-cache/sci-electronics/labone-21.08.20515-r2
 2304071910 metadata/md5-cache/sci-electronics/electric-9.03
 2304071910 metadata/md5-cache/sci-electronics/spice-3.5.5-r3
-2304101210 metadata/md5-cache/sci-electronics/Manifest.gz
 2304101110 metadata/md5-cache/sci-electronics/iverilog-12.0
 2304101110 metadata/md5-cache/sci-electronics/iverilog-9999
 2304101210 metadata/md5-cache/sci-electronics/klayout-0.28.5
 2304101210 metadata/md5-cache/sci-electronics/klayout-9999
 2304081740 metadata/md5-cache/sci-electronics/ktechlab-0.51.0
+2304192110 metadata/md5-cache/sci-electronics/Manifest.gz
+2304192110 metadata/md5-cache/sci-electronics/kicad-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-6.0.9-r1
+2304192110 metadata/md5-cache/sci-electronics/kicad-7.0.1
+2304192110 metadata/md5-cache/sci-electronics/kicad-9999
+2304192110 metadata/md5-cache/sci-electronics/kicad-footprints-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-footprints-7.0.1
+2304192110 metadata/md5-cache/sci-electronics/kicad-meta-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-meta-7.0.1
+2304192110 metadata/md5-cache/sci-electronics/kicad-packages3d-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-packages3d-7.0.1
+2304192110 metadata/md5-cache/sci-electronics/kicad-symbols-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-symbols-7.0.1
+2304192110 metadata/md5-cache/sci-electronics/kicad-templates-6.0.11
+2304192110 metadata/md5-cache/sci-electronics/kicad-templates-7.0.1
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
 2108222309 metadata/md5-cache/sci-geosciences/gshhs-data-2.2.0
@@ -50363,17 +50500,17 @@
 2304020410 metadata/md5-cache/sci-geosciences/gnome-maps-44.0
 2304051141 metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
 2304051141 metadata/md5-cache/sci-geosciences/gpsd-3.24
-2304051141 metadata/md5-cache/sci-geosciences/gpsd-3.25
 2304051141 metadata/md5-cache/sci-geosciences/gpsd-9999
 2304020410 metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
 2304020410 metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.05
 2304020410 metadata/md5-cache/sci-geosciences/osm-gps-map-1.2.0
 2304051141 metadata/md5-cache/sci-geosciences/pymap3d-2.9.1
 2304051141 metadata/md5-cache/sci-geosciences/routino-3.3.3-r2
-2304051141 metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
 2304071910 metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
-2304121540 metadata/md5-cache/sci-geosciences/Manifest.gz
 2304121540 metadata/md5-cache/sci-geosciences/gpxsee-12.4
+2304191510 metadata/md5-cache/sci-geosciences/Manifest.gz
+2304191340 metadata/md5-cache/sci-geosciences/gpsd-3.25
+2304191510 metadata/md5-cache/sci-geosciences/routino-3.3.3-r4
 2002230040 metadata/md5-cache/sci-libs/beagle-3.0.3-r1
 2110211309 metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
 2102270639 metadata/md5-cache/sci-libs/coinor-alps-1.5.7
@@ -50465,7 +50602,6 @@
 2303261522 metadata/md5-cache/sci-libs/cfitsio-4.1.0-r1
 2303261522 metadata/md5-cache/sci-libs/cfitsio-4.2.0
 2303261522 metadata/md5-cache/sci-libs/cgcode-1.0-r2
-2303261541 metadata/md5-cache/sci-libs/cgnslib-4.3.0
 2303261522 metadata/md5-cache/sci-libs/cholmod-3.0.13
 2303261522 metadata/md5-cache/sci-libs/cholmod-3.0.14
 2303261522 metadata/md5-cache/sci-libs/cifparse-obj-7.105
@@ -50535,7 +50671,6 @@
 2303261522 metadata/md5-cache/sci-libs/hypre-2.24.0
 2303261522 metadata/md5-cache/sci-libs/idlcoyote-99999999
 2303261541 metadata/md5-cache/sci-libs/ignition-fuel-tools-4.4.0
-2303261541 metadata/md5-cache/sci-libs/ignition-math-6.10.0
 2303261522 metadata/md5-cache/sci-libs/iml-1.0.5
 2303261522 metadata/md5-cache/sci-libs/inchi-1.04-r1
 2303261522 metadata/md5-cache/sci-libs/inchi-1.06-r1
@@ -50556,7 +50691,6 @@
 2303261541 metadata/md5-cache/sci-libs/libcerf-1.17
 2303261541 metadata/md5-cache/sci-libs/libcifpp-2.0.4-r1
 2303261541 metadata/md5-cache/sci-libs/libcifpp-3.0.0
-2303261541 metadata/md5-cache/sci-libs/libcifpp-5.0.5
 2303261541 metadata/md5-cache/sci-libs/libcifpp-5.0.8
 2303261522 metadata/md5-cache/sci-libs/libdap-3.20.9
 2303261541 metadata/md5-cache/sci-libs/libecpint-1.0.6
@@ -50604,7 +50738,6 @@
 2303261522 metadata/md5-cache/sci-libs/m4rie-20200115-r1
 2303261541 metadata/md5-cache/sci-libs/mathgl-2.4.4-r1
 2303261522 metadata/md5-cache/sci-libs/mc-1.5
-2303261541 metadata/md5-cache/sci-libs/med-4.1.1
 2303261541 metadata/md5-cache/sci-libs/metis-5.1.0-r5
 2303261522 metadata/md5-cache/sci-libs/minuit-5.34.14
 2303261541 metadata/md5-cache/sci-libs/miopen-5.1.3-r1
@@ -50745,8 +50878,11 @@
 2304140710 metadata/md5-cache/sci-libs/plplot-5.15.0-r105
 2304131010 metadata/md5-cache/sci-libs/transformers-4.27.4
 2304161540 metadata/md5-cache/sci-libs/symengine-0.10.1
-2304181140 metadata/md5-cache/sci-libs/Manifest.gz
 2304181140 metadata/md5-cache/sci-libs/hdf5-1.14.0
+2304181910 metadata/md5-cache/sci-libs/Manifest.gz
+2304181910 metadata/md5-cache/sci-libs/cgnslib-4.3.0-r1
+2304181640 metadata/md5-cache/sci-libs/ignition-math-6.14.0
+2304181910 metadata/md5-cache/sci-libs/med-4.1.1-r1
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2101061839 metadata/md5-cache/sci-mathematics/lrcalc-1.2
 2101061839 metadata/md5-cache/sci-mathematics/pari-data-20191216
@@ -50775,15 +50911,12 @@
 2303261522 metadata/md5-cache/sci-mathematics/bertini-1.6
 2303261541 metadata/md5-cache/sci-mathematics/boolector-3.2.2_p20220110
 2303261541 metadata/md5-cache/sci-mathematics/btor2tools-1.0.0_pre20220518-r1
-2303261541 metadata/md5-cache/sci-mathematics/cadabra-2.4.2.1-r1
 2303261541 metadata/md5-cache/sci-mathematics/cadabra-2.4.2.2-r1
 2303261541 metadata/md5-cache/sci-mathematics/cadabra-2.4.3.2
 2303261522 metadata/md5-cache/sci-mathematics/cadical-1.5.2-r1
 2303261522 metadata/md5-cache/sci-mathematics/cadical-1.5.3-r1
 2303261522 metadata/md5-cache/sci-mathematics/calc-2.13.0.1
 2303261541 metadata/md5-cache/sci-mathematics/cgal-5.5
-2303261541 metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4
-2303261541 metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
 2303261541 metadata/md5-cache/sci-mathematics/cvc4-1.8-r4
 2303261522 metadata/md5-cache/sci-mathematics/dataplot-20131220
 2303261541 metadata/md5-cache/sci-mathematics/diagrtb-2.64
@@ -50806,7 +50939,6 @@
 2303261522 metadata/md5-cache/sci-mathematics/gimps-30.8.15
 2303261522 metadata/md5-cache/sci-mathematics/gimps-30.8.17
 2303261522 metadata/md5-cache/sci-mathematics/ginac-1.8.2
-2303261522 metadata/md5-cache/sci-mathematics/ginac-1.8.6
 2303261522 metadata/md5-cache/sci-mathematics/glpk-5.0-r1
 2303261522 metadata/md5-cache/sci-mathematics/gmm-5.4
 2303261522 metadata/md5-cache/sci-mathematics/gsl-shell-2.3.2
@@ -50815,10 +50947,6 @@
 2303261522 metadata/md5-cache/sci-mathematics/jags-4.3.1
 2303261522 metadata/md5-cache/sci-mathematics/kissat-3.0.0
 2303261541 metadata/md5-cache/sci-mathematics/lean-3.49.0
-2303261541 metadata/md5-cache/sci-mathematics/lean-3.50.1
-2303261541 metadata/md5-cache/sci-mathematics/lean-3.50.2
-2303261541 metadata/md5-cache/sci-mathematics/lean-3.50.3
-2303261541 metadata/md5-cache/sci-mathematics/lean-3.9999
 2303261541 metadata/md5-cache/sci-mathematics/libpoly-0.1.11
 2303261522 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.11-r2
 2303261522 metadata/md5-cache/sci-mathematics/mathematica-10.3.1-r1
@@ -50900,7 +51028,6 @@
 2304161540 metadata/md5-cache/sci-mathematics/gmp-ecm-7.0.5-r1
 2304152040 metadata/md5-cache/sci-mathematics/opensmt-2.5.0
 2304181040 metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
-2304181040 metadata/md5-cache/sci-mathematics/Manifest.gz
 2304180340 metadata/md5-cache/sci-mathematics/acl2-8.5
 2304180340 metadata/md5-cache/sci-mathematics/alectryon-1.4.0-r1
 2304180340 metadata/md5-cache/sci-mathematics/coq-serapi-0.16.1
@@ -50913,10 +51040,15 @@
 2304180340 metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
 2304180340 metadata/md5-cache/sci-mathematics/gretl-2021d
 2304180340 metadata/md5-cache/sci-mathematics/maxima-5.46.0
-2304180340 metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
 2304180340 metadata/md5-cache/sci-mathematics/singular-4.3.1_p1
 2304180340 metadata/md5-cache/sci-mathematics/singular-4.3.1_p3
 2304180340 metadata/md5-cache/sci-mathematics/twelf-1.7.1-r2
+2304200310 metadata/md5-cache/sci-mathematics/Manifest.gz
+2304181710 metadata/md5-cache/sci-mathematics/cryptominisat-5.11.4
+2304191510 metadata/md5-cache/sci-mathematics/ginac-1.8.6
+2304181710 metadata/md5-cache/sci-mathematics/lean-3.50.3
+2304181710 metadata/md5-cache/sci-mathematics/lean-3.9999
+2304191510 metadata/md5-cache/sci-mathematics/maxima-5.46.0-r1
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2207071340 metadata/md5-cache/sci-misc/ViSP-images-3.5.0
 2302231710 metadata/md5-cache/sci-misc/cdfplayer-12.2.0-r1
@@ -51035,13 +51167,13 @@
 2304051141 metadata/md5-cache/sci-visualization/veusz-3.5.3
 2304080210 metadata/md5-cache/sci-visualization/gr-0.53.0-r2
 2304090110 metadata/md5-cache/sci-visualization/gr-0.72.0
-2304081740 metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
 2304081740 metadata/md5-cache/sci-visualization/labplot-9999
 2304121840 metadata/md5-cache/sci-visualization/veusz-3.6.2
-2304180340 metadata/md5-cache/sci-visualization/Manifest.gz
 2304180340 metadata/md5-cache/sci-visualization/epix-1.2.19
 2304180340 metadata/md5-cache/sci-visualization/gle-4.2.5-r4
 2304180340 metadata/md5-cache/sci-visualization/gle-4.3.3-r3
+2304182140 metadata/md5-cache/sci-visualization/Manifest.gz
+2304182140 metadata/md5-cache/sci-visualization/labplot-2.9.0-r1
 2206171010 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.3
 2212210010 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.4
 2212241040 metadata/md5-cache/sec-policy/apparmor-profiles-3.0.8
@@ -51873,7 +52005,6 @@
 2303041410 metadata/md5-cache/sys-apps/help2man-1.49.3
 2303041510 metadata/md5-cache/sys-apps/sg3_utils-1.47-r1
 2303081840 metadata/md5-cache/sys-apps/osinfo-db-20230308
-2303170110 metadata/md5-cache/sys-apps/cracklib-words-2.9.10
 2303172140 metadata/md5-cache/sys-apps/hponcfg-5.6.0.0-r1
 2303200542 metadata/md5-cache/sys-apps/inxi-3.3.20.1
 2303220842 metadata/md5-cache/sys-apps/hwdata-0.367
@@ -51919,9 +52050,6 @@
 2303261522 metadata/md5-cache/sys-apps/conspy-1.16
 2303261522 metadata/md5-cache/sys-apps/coreutils-8.32-r1
 2303261522 metadata/md5-cache/sys-apps/coreutils-9.1-r2
-2303261522 metadata/md5-cache/sys-apps/coreutils-9.2
-2303261522 metadata/md5-cache/sys-apps/coreutils-9.2-r1
-2303261522 metadata/md5-cache/sys-apps/coreutils-9999
 2303261541 metadata/md5-cache/sys-apps/cpu-x-4.5.1
 2303261541 metadata/md5-cache/sys-apps/cpu-x-4.5.2
 2303261522 metadata/md5-cache/sys-apps/cpuid-20230120
@@ -52194,9 +52322,7 @@
 2303290513 metadata/md5-cache/sys-apps/epoch-1.3.0
 2303290513 metadata/md5-cache/sys-apps/epoch-9999
 2303290513 metadata/md5-cache/sys-apps/firejail-0.9.70
-2303290513 metadata/md5-cache/sys-apps/firejail-0.9.72
 2303290513 metadata/md5-cache/sys-apps/flatpak-1.12.3-r1
-2303290513 metadata/md5-cache/sys-apps/flatpak-1.12.8
 2303290513 metadata/md5-cache/sys-apps/flatpak-1.14.1
 2303290513 metadata/md5-cache/sys-apps/hd-idle-1.05-r1
 2303290513 metadata/md5-cache/sys-apps/hd-idle-1.05-r2
@@ -52262,7 +52388,6 @@
 2304060240 metadata/md5-cache/sys-apps/fd-8.7.0
 2304051141 metadata/md5-cache/sys-apps/file-5.44-r3
 2304051141 metadata/md5-cache/sys-apps/file-9999
-2304060610 metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
 2304051141 metadata/md5-cache/sys-apps/gcp-0.2.1
 2304020410 metadata/md5-cache/sys-apps/gnome-disk-utility-43.0
 2304020410 metadata/md5-cache/sys-apps/gnome-disk-utility-44.0
@@ -52315,7 +52440,6 @@
 2304091840 metadata/md5-cache/sys-apps/selinux-python-3.5
 2304091840 metadata/md5-cache/sys-apps/semodule-utils-3.5
 2304082110 metadata/md5-cache/sys-apps/servicelog-1.1.16
-2304110110 metadata/md5-cache/sys-apps/coreutils-9.2_p20230410
 2304110140 metadata/md5-cache/sys-apps/daemonize-1.7.8
 2304102240 metadata/md5-cache/sys-apps/diffutils-3.9-r1
 2304110010 metadata/md5-cache/sys-apps/nvme-cli-2.4-r1
@@ -52332,16 +52456,24 @@
 2304151540 metadata/md5-cache/sys-apps/s6-portable-utils-2.3.0.2
 2304160810 metadata/md5-cache/sys-apps/groff-1.23.0_rc4
 2304152040 metadata/md5-cache/sys-apps/system-monitoring-center-2.10.0
-2304180910 metadata/md5-cache/sys-apps/Manifest.gz
 2304180040 metadata/md5-cache/sys-apps/earlyoom-1.7
 2304180040 metadata/md5-cache/sys-apps/earlyoom-9999
 2304180040 metadata/md5-cache/sys-apps/goawk-1.21.0
 2304180040 metadata/md5-cache/sys-apps/goawk-1.22.0
 2304180040 metadata/md5-cache/sys-apps/moar-1.12.0
 2304180040 metadata/md5-cache/sys-apps/moar-1.13.0
-2304180910 metadata/md5-cache/sys-apps/openrc-0.47
 2304180340 metadata/md5-cache/sys-apps/qingy-1.0.0-r6
 2304180040 metadata/md5-cache/sys-apps/rootlesskit-0.14.2
+2304202010 metadata/md5-cache/sys-apps/Manifest.gz
+2304182010 metadata/md5-cache/sys-apps/coreutils-9.3
+2304182010 metadata/md5-cache/sys-apps/coreutils-9999
+2304191440 metadata/md5-cache/sys-apps/cracklib-words-2.9.10
+2304191310 metadata/md5-cache/sys-apps/firejail-0.9.72
+2304200810 metadata/md5-cache/sys-apps/flatpak-1.12.8
+2304200810 metadata/md5-cache/sys-apps/flatpak-1.14.4-r1
+2304202010 metadata/md5-cache/sys-apps/openrc-0.47.1
+2304191010 metadata/md5-cache/sys-apps/shadow-4.13-r3
+2304201910 metadata/md5-cache/sys-apps/util-linux-2.39_rc3
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -52349,8 +52481,6 @@
 2205171240 metadata/md5-cache/sys-auth/pam_mount-2.18-r1
 2212022210 metadata/md5-cache/sys-auth/pam_krb5-4.11
 2303100910 metadata/md5-cache/sys-auth/realtime-base-0.1-r1
-2303261541 metadata/md5-cache/sys-auth/AusweisApp2-1.26.2
-2303261541 metadata/md5-cache/sys-auth/AusweisApp2-1.26.3
 2303261541 metadata/md5-cache/sys-auth/AusweisApp2-9999
 2303261522 metadata/md5-cache/sys-auth/fprintd-1.94.1
 2303261522 metadata/md5-cache/sys-auth/fprintd-1.94.2
@@ -52405,8 +52535,6 @@
 2303261522 metadata/md5-cache/sys-auth/seatd-0.7.0
 2303261522 metadata/md5-cache/sys-auth/seatd-0.7.0-r1
 2303261522 metadata/md5-cache/sys-auth/seatd-9999
-2303261522 metadata/md5-cache/sys-auth/skey-1.1.5-r13
-2303261522 metadata/md5-cache/sys-auth/skey-1.1.5-r14
 2303261522 metadata/md5-cache/sys-auth/ykpers-1.20.0-r1
 2303261522 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.25
 2303290513 metadata/md5-cache/sys-auth/elogind-246.10-r1
@@ -52418,13 +52546,15 @@
 2304051141 metadata/md5-cache/sys-auth/solo1-0.1.1
 2304051141 metadata/md5-cache/sys-auth/solo1-0.1.1-r1
 2304051141 metadata/md5-cache/sys-auth/ssh-import-id-5.11
-2304051141 metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
 2304051141 metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.4.0
 2304042240 metadata/md5-cache/sys-auth/yubico-piv-tool-2.3.1
 2304160840 metadata/md5-cache/sys-auth/oath-toolkit-2.6.2-r3
-2304180840 metadata/md5-cache/sys-auth/Manifest.gz
 2304180040 metadata/md5-cache/sys-auth/docker_auth-1.9.0
 2304180840 metadata/md5-cache/sys-auth/oath-toolkit-2.6.7-r2
+2304190010 metadata/md5-cache/sys-auth/AusweisApp2-1.26.3
+2304191410 metadata/md5-cache/sys-auth/Manifest.gz
+2304190910 metadata/md5-cache/sys-auth/skey-1.1.5-r14
+2304191410 metadata/md5-cache/sys-auth/ssh-import-id-5.11-r1
 1911072009 metadata/md5-cache/sys-block/endpoint-0.1.0-r1
 1702282333 metadata/md5-cache/sys-block/hdrecover-0.5
 2010272109 metadata/md5-cache/sys-block/lsiutil-1.62-r3
@@ -52822,7 +52952,6 @@
 2303261522 metadata/md5-cache/sys-devel/make-4.4.1
 2303261522 metadata/md5-cache/sys-devel/make-9999
 2303261541 metadata/md5-cache/sys-devel/mold-1.10.1
-2303261541 metadata/md5-cache/sys-devel/mold-1.11.0
 2303261541 metadata/md5-cache/sys-devel/mold-9999
 2303261522 metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
 2303261522 metadata/md5-cache/sys-devel/nvptx-tools-9999
@@ -52862,7 +52991,6 @@
 2304022010 metadata/md5-cache/sys-devel/binutils-hppa64-2.40-r4
 2304041140 metadata/md5-cache/sys-devel/bmake-20230321
 2304052140 metadata/md5-cache/sys-devel/clang-runtime-16.0.1
-2304050940 metadata/md5-cache/sys-devel/clang-runtime-16.0.2.9999
 2304060240 metadata/md5-cache/sys-devel/rust-std-1.68.2
 2304071010 metadata/md5-cache/sys-devel/flex-2.6.4-r6
 2304071910 metadata/md5-cache/sys-devel/gdb-apple-1752
@@ -52872,42 +53000,8 @@
 2304081640 metadata/md5-cache/sys-devel/distcc-3.4-r1
 2304101140 metadata/md5-cache/sys-devel/gcc-config-2.10
 2304112210 metadata/md5-cache/sys-devel/bmake-20230303
-2304142240 metadata/md5-cache/sys-devel/clang-14.0.6-r1
-2304142240 metadata/md5-cache/sys-devel/clang-15.0.7-r1
-2304142240 metadata/md5-cache/sys-devel/clang-16.0.1
-2304142240 metadata/md5-cache/sys-devel/clang-16.0.2.9999
-2304142240 metadata/md5-cache/sys-devel/clang-17.0.0.9999
-2304142240 metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-devel/clang-common-14.0.6
-2304142240 metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
-2304142240 metadata/md5-cache/sys-devel/clang-common-16.0.1
-2304142240 metadata/md5-cache/sys-devel/clang-common-16.0.2.9999
-2304142240 metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
-2304142240 metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414
 2304142240 metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-devel/lld-14.0.6-r1
-2304142240 metadata/md5-cache/sys-devel/lld-15.0.7
-2304142240 metadata/md5-cache/sys-devel/lld-16.0.1
-2304142240 metadata/md5-cache/sys-devel/lld-16.0.2.9999
-2304142240 metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-devel/llvm-14.0.6-r2
-2304142240 metadata/md5-cache/sys-devel/llvm-15.0.7
-2304142240 metadata/md5-cache/sys-devel/llvm-16.0.1
-2304142240 metadata/md5-cache/sys-devel/llvm-16.0.2.9999
-2304142240 metadata/md5-cache/sys-devel/llvm-17.0.0.9999
-2304142240 metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-devel/llvm-common-14.0.6
-2304142240 metadata/md5-cache/sys-devel/llvm-common-15.0.7
-2304142240 metadata/md5-cache/sys-devel/llvm-common-16.0.1
-2304142240 metadata/md5-cache/sys-devel/llvm-common-16.0.2.9999
-2304142240 metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
-2304142240 metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414
 2304160640 metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20230114
-2304181310 metadata/md5-cache/sys-devel/Manifest.gz
 2304181310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20230119-r1
 2304181310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20230302
 2304181310 metadata/md5-cache/sys-devel/gcc-10.4.1_p20230413
@@ -52930,8 +53024,52 @@
 2304181310 metadata/md5-cache/sys-devel/kgcc64-10.4.0
 2304181310 metadata/md5-cache/sys-devel/kgcc64-11.3.0
 2304181310 metadata/md5-cache/sys-devel/kgcc64-12.2.0
-2304172210 metadata/md5-cache/sys-devel/lld-17.0.0.9999
-2304172210 metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414
+2304200740 metadata/md5-cache/sys-devel/Manifest.gz
+2304192310 metadata/md5-cache/sys-devel/clang-14.0.6-r1
+2304192310 metadata/md5-cache/sys-devel/clang-15.0.7-r1
+2304192310 metadata/md5-cache/sys-devel/clang-16.0.1
+2304192310 metadata/md5-cache/sys-devel/clang-16.0.2
+2304192310 metadata/md5-cache/sys-devel/clang-16.0.3.9999
+2304192310 metadata/md5-cache/sys-devel/clang-17.0.0.9999
+2304192310 metadata/md5-cache/sys-devel/clang-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-devel/clang-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-devel/clang-common-14.0.6
+2304192310 metadata/md5-cache/sys-devel/clang-common-15.0.7-r5
+2304192310 metadata/md5-cache/sys-devel/clang-common-16.0.1
+2304192310 metadata/md5-cache/sys-devel/clang-common-16.0.2
+2304192310 metadata/md5-cache/sys-devel/clang-common-16.0.3.9999
+2304192310 metadata/md5-cache/sys-devel/clang-common-17.0.0.9999
+2304192310 metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-devel/clang-runtime-16.0.2
+2304191910 metadata/md5-cache/sys-devel/clang-runtime-16.0.3.9999
+2304200740 metadata/md5-cache/sys-devel/gcc-10.4.1_p20230419
+2304191740 metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230419-r1
+2304192310 metadata/md5-cache/sys-devel/lld-14.0.6-r1
+2304192310 metadata/md5-cache/sys-devel/lld-15.0.7
+2304192310 metadata/md5-cache/sys-devel/lld-16.0.1
+2304192310 metadata/md5-cache/sys-devel/lld-16.0.2
+2304192310 metadata/md5-cache/sys-devel/lld-16.0.3.9999
+2304192310 metadata/md5-cache/sys-devel/lld-17.0.0.9999
+2304192310 metadata/md5-cache/sys-devel/lld-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-devel/lld-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+2304192310 metadata/md5-cache/sys-devel/llvm-15.0.7
+2304192310 metadata/md5-cache/sys-devel/llvm-16.0.1
+2304192310 metadata/md5-cache/sys-devel/llvm-16.0.2
+2304192310 metadata/md5-cache/sys-devel/llvm-16.0.3.9999
+2304192310 metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+2304192310 metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-devel/llvm-common-14.0.6
+2304192310 metadata/md5-cache/sys-devel/llvm-common-15.0.7
+2304192310 metadata/md5-cache/sys-devel/llvm-common-16.0.1
+2304192310 metadata/md5-cache/sys-devel/llvm-common-16.0.2
+2304192310 metadata/md5-cache/sys-devel/llvm-common-16.0.3.9999
+2304192310 metadata/md5-cache/sys-devel/llvm-common-17.0.0.9999
+2304192310 metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230414
+2304190940 metadata/md5-cache/sys-devel/mold-1.11.0
 2303261522 metadata/md5-cache/sys-fabric/Manifest.gz
 2303261522 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2303261522 metadata/md5-cache/sys-fabric/mstflint-4.20.0_p1
@@ -53138,7 +53276,6 @@
 2303261522 metadata/md5-cache/sys-fs/squashfs-tools-4.6.1
 2303261522 metadata/md5-cache/sys-fs/squashfs-tools-ng-9999
 2303261522 metadata/md5-cache/sys-fs/squashfuse-0.1.103
-2303261522 metadata/md5-cache/sys-fs/squashfuse-0.1.105
 2303261522 metadata/md5-cache/sys-fs/sysfsutils-2.1.1
 2303261522 metadata/md5-cache/sys-fs/treesize-0.54.1-r1
 2303261522 metadata/md5-cache/sys-fs/udev-250
@@ -53212,12 +53349,16 @@
 2304150340 metadata/md5-cache/sys-fs/zfs-kmod-9999
 2304161540 metadata/md5-cache/sys-fs/f2fs-tools-1.16.0
 2304160710 metadata/md5-cache/sys-fs/zfs-kmod-2.1.10-r1
-2304181310 metadata/md5-cache/sys-fs/Manifest.gz
 2304181310 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
 2304181310 metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
 2304180040 metadata/md5-cache/sys-fs/duf-0.8.1
 2304180040 metadata/md5-cache/sys-fs/fscrypt-0.3.3
 2304180040 metadata/md5-cache/sys-fs/go-mtpfs-1.0.0
+2304201940 metadata/md5-cache/sys-fs/Manifest.gz
+2304190040 metadata/md5-cache/sys-fs/mergerfs-2.35.1
+2304190440 metadata/md5-cache/sys-fs/squashfuse-0.1.105
+2304201940 metadata/md5-cache/sys-fs/zfs-2.1.11
+2304201940 metadata/md5-cache/sys-fs/zfs-kmod-2.1.11
 2210040240 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-2
 2303180118 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
 2303180118 metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -53289,7 +53430,6 @@
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-4.19.277_p122
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-4.9.327_p197
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-5.10.176_p86
-2303261522 metadata/md5-cache/sys-kernel/rt-sources-5.15.96_p61
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-5.4.230_p80
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-6.0.5_p14
 2303261522 metadata/md5-cache/sys-kernel/rt-sources-6.1.19_p8
@@ -53337,10 +53477,6 @@
 2304052140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.177
 2304052140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.106
 2304052140 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.240
-2304051340 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.312
-2304051340 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.280
-2304051340 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.177
-2304051340 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.240
 2304062310 metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.23
 2304062310 metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.10
 2304061910 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.177
@@ -53382,12 +53518,24 @@
 2304140540 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.107
 2304140540 metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.24
 2304140540 metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.11
-2304131940 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.107
-2304131940 metadata/md5-cache/sys-kernel/vanilla-sources-6.1.24
-2304131940 metadata/md5-cache/sys-kernel/vanilla-sources-6.2.11
 2304152110 metadata/md5-cache/sys-kernel/zen-sources-6.2.11
-2304170240 metadata/md5-cache/sys-kernel/Manifest.gz
 2304170240 metadata/md5-cache/sys-kernel/git-sources-6.3_rc7
+2304201640 metadata/md5-cache/sys-kernel/Manifest.gz
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.313
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.281
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.178
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.108
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.241
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-6.1.25
+2304201640 metadata/md5-cache/sys-kernel/gentoo-sources-6.2.12
+2304201440 metadata/md5-cache/sys-kernel/rt-sources-5.15.107_p62
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.313
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.281
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.178
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.108
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.241
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-6.1.25
+2304201440 metadata/md5-cache/sys-kernel/vanilla-sources-6.2.12
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -53527,7 +53675,6 @@
 2304011940 metadata/md5-cache/sys-libs/uid_wrapper-1.3.0
 2304022340 metadata/md5-cache/sys-libs/binutils-libs-2.39-r5
 2304022010 metadata/md5-cache/sys-libs/binutils-libs-2.40-r4
-2304051141 metadata/md5-cache/sys-libs/cracklib-2.9.10-r1
 2304051141 metadata/md5-cache/sys-libs/cracklib-2.9.11
 2304051141 metadata/md5-cache/sys-libs/cracklib-2.9.8
 2304051141 metadata/md5-cache/sys-libs/libapparmor-3.0.3-r1
@@ -53559,55 +53706,64 @@
 2304091840 metadata/md5-cache/sys-libs/libsemanage-3.5
 2304091840 metadata/md5-cache/sys-libs/libsepol-3.5
 2304092140 metadata/md5-cache/sys-libs/minizip-ng-3.0.10
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-15.0.7
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-16.0.1
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414
 2304140210 metadata/md5-cache/sys-libs/glibc-2.36-r8
 2304140210 metadata/md5-cache/sys-libs/glibc-2.37-r2
-2304142240 metadata/md5-cache/sys-libs/libcxx-14.0.6
-2304142240 metadata/md5-cache/sys-libs/libcxx-15.0.7
-2304142240 metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
-2304142240 metadata/md5-cache/sys-libs/libcxx-16.0.1
-2304142240 metadata/md5-cache/sys-libs/libcxx-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-15.0.7
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-16.0.1
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-libs/libomp-14.0.6-r1
-2304142240 metadata/md5-cache/sys-libs/libomp-15.0.7-r2
-2304142240 metadata/md5-cache/sys-libs/libomp-16.0.1
-2304142240 metadata/md5-cache/sys-libs/libomp-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/libomp-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2.9999
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325
-2304142240 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414
 2304131040 metadata/md5-cache/sys-libs/ncurses-6.4_p20230401
 2304130510 metadata/md5-cache/sys-libs/ncurses-6.4_p20230408
-2304160640 metadata/md5-cache/sys-libs/Manifest.gz
 2304160640 metadata/md5-cache/sys-libs/ncurses-6.4_p20230415
+2304201840 metadata/md5-cache/sys-libs/Manifest.gz
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-16.0.1
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-16.0.2
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.1
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.2
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230414
+2304191440 metadata/md5-cache/sys-libs/cracklib-2.9.10-r1
+2304192310 metadata/md5-cache/sys-libs/libcxx-14.0.6
+2304192310 metadata/md5-cache/sys-libs/libcxx-15.0.7
+2304192310 metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+2304192310 metadata/md5-cache/sys-libs/libcxx-16.0.1
+2304192310 metadata/md5-cache/sys-libs/libcxx-16.0.2
+2304192310 metadata/md5-cache/sys-libs/libcxx-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/libcxx-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-16.0.1
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-16.0.2
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+2304192310 metadata/md5-cache/sys-libs/libomp-15.0.7-r2
+2304192310 metadata/md5-cache/sys-libs/libomp-16.0.1
+2304192310 metadata/md5-cache/sys-libs/libomp-16.0.2
+2304192310 metadata/md5-cache/sys-libs/libomp-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230414
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.1
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.2
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-16.0.3.9999
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0.9999
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230325
+2304192310 metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230414
+2304190610 metadata/md5-cache/sys-libs/ncurses-6.4_p20230418
+2304201840 metadata/md5-cache/sys-libs/snapd-glib-1.63
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
@@ -53739,8 +53895,9 @@
 2304071910 metadata/md5-cache/sys-process/runit-2.1.2-r1
 2304082110 metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r2
 2304140340 metadata/md5-cache/sys-process/parallel-20230322
-2304180040 metadata/md5-cache/sys-process/Manifest.gz
 2304180040 metadata/md5-cache/sys-process/ctop-0.7.7
+2304181640 metadata/md5-cache/sys-process/Manifest.gz
+2304181640 metadata/md5-cache/sys-process/bottom-0.8.0-r1
 2108131839 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 2108190539 metadata/md5-cache/virtual/checkpassword-0-r1
 2101040639 metadata/md5-cache/virtual/gnustep-back-0.28.0
@@ -54031,13 +54188,13 @@
 2303261522 metadata/md5-cache/www-apache/pwauth-2.3.10-r2
 2303290513 metadata/md5-cache/www-apache/mpm_itk-2.4.7_p4-r2
 2304071910 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
-2304091010 metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1
 2304101210 metadata/md5-cache/www-apache/passenger-6.0.15
 2304101210 metadata/md5-cache/www-apache/passenger-6.0.16
 2304101210 metadata/md5-cache/www-apache/passenger-6.0.17
 2304121540 metadata/md5-cache/www-apache/mod_h2-2.0.14
-2304140340 metadata/md5-cache/www-apache/Manifest.gz
 2304140340 metadata/md5-cache/www-apache/mod_musicindex-1.4.1-r4
+2304191440 metadata/md5-cache/www-apache/Manifest.gz
+2304191440 metadata/md5-cache/www-apache/mod_wsgi-4.9.4-r1
 2108080310 metadata/md5-cache/www-apps/airdcpp-webui-2.11.0
 2107052310 metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.1.0
 1702282334 metadata/md5-cache/www-apps/icingaweb2-module-pnp4nagios-1.0.1
@@ -54066,10 +54223,6 @@
 2303261522 metadata/md5-cache/www-apps/davical-1.1.9.3
 2303261522 metadata/md5-cache/www-apps/davical-1.1.9.3-r1
 2303261522 metadata/md5-cache/www-apps/dotproject-2.1.7-r2
-2303261522 metadata/md5-cache/www-apps/drupal-10.0.5
-2303261522 metadata/md5-cache/www-apps/drupal-7.95
-2303261522 metadata/md5-cache/www-apps/drupal-9.4.12
-2303261522 metadata/md5-cache/www-apps/drupal-9.5.5
 2303261522 metadata/md5-cache/www-apps/element-1.11.24
 2303261522 metadata/md5-cache/www-apps/icingaweb2-2.11.4
 2303261522 metadata/md5-cache/www-apps/icingaweb2-9999
@@ -54120,7 +54273,6 @@
 2303261522 metadata/md5-cache/www-apps/wiliki-0.6.1-r1
 2303261522 metadata/md5-cache/www-apps/wordpress-6.1.1
 2303261522 metadata/md5-cache/www-apps/xpra-html5-5.0
-2303261522 metadata/md5-cache/www-apps/xpra-html5-6.1
 2303261522 metadata/md5-cache/www-apps/zeppelin-bin-0.10.1
 2303270810 metadata/md5-cache/www-apps/grafana-bin-9.3.11
 2303270810 metadata/md5-cache/www-apps/grafana-bin-9.4.7
@@ -54171,7 +54323,6 @@
 2304131410 metadata/md5-cache/www-apps/nextcloud-24.0.11
 2304131410 metadata/md5-cache/www-apps/nextcloud-25.0.5
 2304131410 metadata/md5-cache/www-apps/nextcloud-26.0.0
-2304180040 metadata/md5-cache/www-apps/Manifest.gz
 2304180040 metadata/md5-cache/www-apps/gitea-1.18.3
 2304180040 metadata/md5-cache/www-apps/gitea-1.18.5
 2304180040 metadata/md5-cache/www-apps/gitea-1.19.1
@@ -54182,6 +54333,12 @@
 2304180040 metadata/md5-cache/www-apps/miniflux-2.0.43-r1
 2304171710 metadata/md5-cache/www-apps/radarr-4.4.4.7068
 2304180040 metadata/md5-cache/www-apps/trickster-1.1.5
+2304200740 metadata/md5-cache/www-apps/Manifest.gz
+2304192140 metadata/md5-cache/www-apps/drupal-10.0.8
+2304192140 metadata/md5-cache/www-apps/drupal-7.96
+2304192140 metadata/md5-cache/www-apps/drupal-9.4.14
+2304192140 metadata/md5-cache/www-apps/drupal-9.5.8
+2304200740 metadata/md5-cache/www-apps/xpra-html5-6.1
 2303261522 metadata/md5-cache/www-client/elinks-0.13.5-r100
 2303261522 metadata/md5-cache/www-client/elinks-0.15.1-r1
 2303261522 metadata/md5-cache/www-client/fetch-1.0-r4
@@ -54237,15 +54394,12 @@
 2304081740 metadata/md5-cache/www-client/falkon-22.12.3
 2304111010 metadata/md5-cache/www-client/firefox-bin-102.10.0
 2304111910 metadata/md5-cache/www-client/google-chrome-unstable-114.0.5696.0
-2304141910 metadata/md5-cache/www-client/chromium-112.0.5615.49
 2304141910 metadata/md5-cache/www-client/elinks-0.16.0
 2304141910 metadata/md5-cache/www-client/elinks-9999
 2304141240 metadata/md5-cache/www-client/firefox-102.10.0
 2304141540 metadata/md5-cache/www-client/firefox-112.0
 2304151110 metadata/md5-cache/www-client/vivaldi-5.7.2921.68
 2304151110 metadata/md5-cache/www-client/vivaldi-snapshot-6.0.2979.2
-2304181140 metadata/md5-cache/www-client/Manifest.gz
-2304181140 metadata/md5-cache/www-client/firefox-112.0.1
 2304180910 metadata/md5-cache/www-client/firefox-bin-112.0.1
 2304171810 metadata/md5-cache/www-client/google-chrome-112.0.5615.121
 2304171810 metadata/md5-cache/www-client/google-chrome-beta-113.0.5672.37
@@ -54257,6 +54411,10 @@
 2304171810 metadata/md5-cache/www-client/microsoft-edge-dev-113.0.1774.7
 2304171810 metadata/md5-cache/www-client/microsoft-edge-dev-114.0.1788.0
 2304162340 metadata/md5-cache/www-client/vivaldi-snapshot-6.0.2979.9
+2304202110 metadata/md5-cache/www-client/Manifest.gz
+2304202110 metadata/md5-cache/www-client/chromium-112.0.5615.121
+2304181840 metadata/md5-cache/www-client/chromium-112.0.5615.49
+2304190940 metadata/md5-cache/www-client/firefox-112.0.1
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -54280,9 +54438,9 @@
 2304051910 metadata/md5-cache/www-misc/logswan-2.1.14
 2304051910 metadata/md5-cache/www-misc/logswan-9999
 2304051141 metadata/md5-cache/www-misc/urlwatch-2.24
-2304051141 metadata/md5-cache/www-misc/urlwatch-2.25
-2304122240 metadata/md5-cache/www-misc/Manifest.gz
 2304122240 metadata/md5-cache/www-misc/urlwatch-2.26
+2304191310 metadata/md5-cache/www-misc/Manifest.gz
+2304191310 metadata/md5-cache/www-misc/urlwatch-2.25
 2211050540 metadata/md5-cache/www-plugins/pdfjs-2.14.305
 2211040340 metadata/md5-cache/www-plugins/pdfjs-3.0.279
 2303261541 metadata/md5-cache/www-plugins/lightspark-0.8.6.1
@@ -54306,7 +54464,6 @@
 2303261522 metadata/md5-cache/www-servers/monkeyd-1.6.9-r2
 2303261522 metadata/md5-cache/www-servers/monkeyd-9999
 2303261522 metadata/md5-cache/www-servers/moonbridge-1.0.1
-2303261522 metadata/md5-cache/www-servers/nginx-1.23.2
 2303261522 metadata/md5-cache/www-servers/nginx-1.23.2-r3
 2303261522 metadata/md5-cache/www-servers/nginx-unit-1.29.0
 2303261522 metadata/md5-cache/www-servers/nginx-unit-1.29.1
@@ -54345,11 +54502,15 @@
 2304140440 metadata/md5-cache/www-servers/apache-2.4.57
 2304130610 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
 2304161010 metadata/md5-cache/www-servers/sniproxy-0.6.1
-2304180040 metadata/md5-cache/www-servers/Manifest.gz
 2304180040 metadata/md5-cache/www-servers/caddy-2.5.2
 2304180040 metadata/md5-cache/www-servers/caddy-2.6.2
 2304180040 metadata/md5-cache/www-servers/caddy-2.6.4
 2304180040 metadata/md5-cache/www-servers/uwsgi-2.0.21
+2304201010 metadata/md5-cache/www-servers/Manifest.gz
+2304190010 metadata/md5-cache/www-servers/nginx-1.24.0
+2304201010 metadata/md5-cache/www-servers/tomcat-10.1.8
+2304201010 metadata/md5-cache/www-servers/tomcat-8.5.88
+2304191010 metadata/md5-cache/www-servers/tomcat-9.0.74
 2303261522 metadata/md5-cache/x11-apps/appres-1.0.6
 2303261522 metadata/md5-cache/x11-apps/bdftopcf-1.1.1
 2303261522 metadata/md5-cache/x11-apps/beforelight-1.0.6
@@ -54634,7 +54795,6 @@
 2304020410 metadata/md5-cache/x11-libs/vte-0.68.0
 2304020410 metadata/md5-cache/x11-libs/vte-0.70.3
 2304020410 metadata/md5-cache/x11-libs/vte-0.72.0
-2304022310 metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1
 2304082040 metadata/md5-cache/x11-libs/cairo-1.17.8
 2304082040 metadata/md5-cache/x11-libs/libXaw-1.0.15
 2304090110 metadata/md5-cache/x11-libs/libgxim-0.5.0
@@ -54645,12 +54805,13 @@
 2304101740 metadata/md5-cache/x11-libs/libXt-1.3.0
 2304140910 metadata/md5-cache/x11-libs/xcb-util-errors-1.0.1
 2304161010 metadata/md5-cache/x11-libs/gtk+-3.24.37
-2304180140 metadata/md5-cache/x11-libs/Manifest.gz
 2304172310 metadata/md5-cache/x11-libs/libXft-2.3.8
 2304172340 metadata/md5-cache/x11-libs/libXpm-3.5.16
 2304180140 metadata/md5-cache/x11-libs/libfm-qt-1.3.0
 2304180140 metadata/md5-cache/x11-libs/qtermwidget-1.3.0
 2304170410 metadata/md5-cache/x11-libs/vte-0.72.1
+2304191440 metadata/md5-cache/x11-libs/Manifest.gz
+2304191440 metadata/md5-cache/x11-libs/wxGTK-3.2.2.1-r1
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
 2111062339 metadata/md5-cache/x11-misc/gbdfed-1.6
 2104200509 metadata/md5-cache/x11-misc/grun-0.9.3-r1
@@ -54743,8 +54904,6 @@
 2303261522 metadata/md5-cache/x11-misc/dmenu-5.1
 2303261522 metadata/md5-cache/x11-misc/dmenu-5.2
 2303261522 metadata/md5-cache/x11-misc/dmenu-9999
-2303261522 metadata/md5-cache/x11-misc/dunst-1.9.0
-2303261522 metadata/md5-cache/x11-misc/dunst-1.9.1
 2303261522 metadata/md5-cache/x11-misc/dunst-9999
 2303261522 metadata/md5-cache/x11-misc/dzen-0.9.5_p2
 2303261522 metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
@@ -54816,7 +54975,6 @@
 2303261541 metadata/md5-cache/x11-misc/pcmanfm-qt-1.2.0
 2303261522 metadata/md5-cache/x11-misc/peksystray-0.4.0
 2303261522 metadata/md5-cache/x11-misc/picom-10.1
-2303261522 metadata/md5-cache/x11-misc/picom-10.2
 2303261522 metadata/md5-cache/x11-misc/picom-9.1
 2303261522 metadata/md5-cache/x11-misc/picom-9999
 2303261522 metadata/md5-cache/x11-misc/piedock-1.6.9
@@ -54986,7 +55144,6 @@
 2304020410 metadata/md5-cache/x11-misc/mozo-1.26.1
 2304051141 metadata/md5-cache/x11-misc/mugshot-0.4.3-r2
 2304020410 metadata/md5-cache/x11-misc/notification-daemon-3.20.0-r1
-2304051141 metadata/md5-cache/x11-misc/py3status-3.49
 2304051141 metadata/md5-cache/x11-misc/safeeyes-2.1.3-r1
 2304051141 metadata/md5-cache/x11-misc/safeeyes-2.1.4
 2304051141 metadata/md5-cache/x11-misc/safeeyes-2.1.4-r1
@@ -55001,7 +55158,6 @@
 2304022040 metadata/md5-cache/x11-misc/xsnow-3.6.0-r1
 2304021640 metadata/md5-cache/x11-misc/xsnow-3.7.4
 2304051141 metadata/md5-cache/x11-misc/zim-0.74.3
-2304051141 metadata/md5-cache/x11-misc/zim-0.75.1
 2304081740 metadata/md5-cache/x11-misc/kronometer-2.3.0
 2304082110 metadata/md5-cache/x11-misc/qt5ct-1.7
 2304082040 metadata/md5-cache/x11-misc/xbitmaps-1.1.3
@@ -55024,7 +55180,6 @@
 2304161740 metadata/md5-cache/x11-misc/xsel-1.2.0-r2
 2304161610 metadata/md5-cache/x11-misc/xsr-1.0.0-r1
 2304161610 metadata/md5-cache/x11-misc/xwrits-2.26-r2
-2304181340 metadata/md5-cache/x11-misc/Manifest.gz
 2304180910 metadata/md5-cache/x11-misc/albert-0.20.13
 2304180340 metadata/md5-cache/x11-misc/emacs-desktop-mail-1.2
 2304181340 metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18-r1
@@ -55034,6 +55189,11 @@
 2304181010 metadata/md5-cache/x11-misc/synergy-1.14.1.32
 2304171640 metadata/md5-cache/x11-misc/virtualgl-3.1
 2304171910 metadata/md5-cache/x11-misc/xsel-1.2.0_p20220310
+2304200810 metadata/md5-cache/x11-misc/Manifest.gz
+2304190010 metadata/md5-cache/x11-misc/dunst-1.9.1
+2304200810 metadata/md5-cache/x11-misc/picom-10.2
+2304191140 metadata/md5-cache/x11-misc/py3status-3.50
+2304200810 metadata/md5-cache/x11-misc/zim-0.75.1
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
 2109091040 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -55119,7 +55279,6 @@
 2303261522 metadata/md5-cache/x11-plugins/lurch-0.7.0
 2303261522 metadata/md5-cache/x11-plugins/pidgin-encryption-3.1-r1
 2303261522 metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3-r1
-2303261522 metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1
 2303261522 metadata/md5-cache/x11-plugins/pidgin-indicator-1.0.1-r2
 2303261522 metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
 2303261522 metadata/md5-cache/x11-plugins/pidgin-mbpurple-0.3.0-r2
@@ -55215,7 +55374,7 @@
 2304131540 metadata/md5-cache/x11-plugins/allin1-0.5.0-r3
 2304131540 metadata/md5-cache/x11-plugins/wmamixer-1.1
 2304131540 metadata/md5-cache/x11-plugins/wmsysmon-0.8.1
-2304151240 metadata/md5-cache/x11-plugins/Manifest.gz
+2304181840 metadata/md5-cache/x11-plugins/Manifest.gz
 2210112040 metadata/md5-cache/x11-terms/st-terminfo-0.8.5
 2211171810 metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.5
 2211171810 metadata/md5-cache/x11-terms/kitty-terminfo-0.26.5
@@ -55342,10 +55501,7 @@
 2303161540 metadata/md5-cache/x11-themes/fedora-backgrounds-34.0.1
 2303161540 metadata/md5-cache/x11-themes/fedora-backgrounds-37.0.5
 2303161540 metadata/md5-cache/x11-themes/fedora-backgrounds-38.0.2
-2303261541 metadata/md5-cache/x11-themes/QGnomePlatform-0.8.4-r1
-2303261541 metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0
 2303261522 metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
-2303261541 metadata/md5-cache/x11-themes/adwaita-qt-1.4.1
 2303261541 metadata/md5-cache/x11-themes/adwaita-qt-1.4.2
 2303261522 metadata/md5-cache/x11-themes/arc-icon-theme-20161122-r1
 2303261522 metadata/md5-cache/x11-themes/arc-theme-20210412
@@ -55393,7 +55549,6 @@
 2303261541 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
 2303261541 metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
 2303261522 metadata/md5-cache/x11-themes/papirus-icon-theme-20230104
-2303261522 metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
 2303261541 metadata/md5-cache/x11-themes/qtcurve-1.9.0_p20210412
 2303261541 metadata/md5-cache/x11-themes/qtcurve-9999
 2303261522 metadata/md5-cache/x11-themes/smplayer-skins-15.2.0-r1
@@ -55427,8 +55582,10 @@
 2304061910 metadata/md5-cache/x11-themes/icewm-extra-themes-1.2
 2304092140 metadata/md5-cache/x11-themes/fedora-backgrounds-38.1.1
 2304082040 metadata/md5-cache/x11-themes/xcursor-themes-1.0.7
-2304180140 metadata/md5-cache/x11-themes/Manifest.gz
 2304180140 metadata/md5-cache/x11-themes/lxqt-themes-1.3.0
+2304201640 metadata/md5-cache/x11-themes/Manifest.gz
+2304201640 metadata/md5-cache/x11-themes/QGnomePlatform-0.9.0-r1
+2304181840 metadata/md5-cache/x11-themes/papirus-icon-theme-20230301
 2207132140 metadata/md5-cache/x11-wm/page-1.9.10
 2207311840 metadata/md5-cache/x11-wm/e16-1.0.25
 2208021040 metadata/md5-cache/x11-wm/e16-1.0.24
@@ -55553,13 +55710,18 @@
 2304150010 metadata/md5-cache/xfce-base/xfce4-panel-4.19.1-r1
 2304150010 metadata/md5-cache/xfce-base/xfdesktop-4.19.0
 2304150840 metadata/md5-cache/xfce-base/xfdesktop-4.19.1
-2304171910 metadata/md5-cache/xfce-base/Manifest.gz
 2304171910 metadata/md5-cache/xfce-base/libxfce4ui-4.19.0
 2304171710 metadata/md5-cache/xfce-base/libxfce4util-4.19.0
 2304171710 metadata/md5-cache/xfce-base/tumbler-4.18.1
 2304171710 metadata/md5-cache/xfce-base/tumbler-4.19.0
 2304171710 metadata/md5-cache/xfce-base/xfconf-4.18.1
 2304171710 metadata/md5-cache/xfce-base/xfconf-4.19.0
+2304200540 metadata/md5-cache/xfce-base/Manifest.gz
+2304181940 metadata/md5-cache/xfce-base/garcon-4.19.0
+2304200540 metadata/md5-cache/xfce-base/xfce4-appfinder-4.19.0
+2304182010 metadata/md5-cache/xfce-base/xfce4-power-manager-4.19.0
+2304182010 metadata/md5-cache/xfce-base/xfce4-session-4.19.0
+2304182140 metadata/md5-cache/xfce-base/xfce4-settings-4.19.0
 2111190939 metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.2
 2206191710 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-2.0.1
 2207260511 metadata/md5-cache/xfce-extra/xfce4-wavelan-plugin-0.6.3
@@ -55609,8 +55771,12 @@
 2303290513 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.4
 2304010940 metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.5.1
 2304011940 metadata/md5-cache/xfce-extra/xfce4-notifyd-0.8.2
-2304150010 metadata/md5-cache/xfce-extra/Manifest.gz
 2304150010 metadata/md5-cache/xfce-extra/xfce4-pulseaudio-plugin-0.4.6
+2304200540 metadata/md5-cache/xfce-extra/Manifest.gz
+2304200540 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.5
+2304200540 metadata/md5-cache/xfce-extra/xfce4-calculator-plugin-0.7.2
+2304200540 metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.3
+2304182010 metadata/md5-cache/xfce-extra/xfce4-timer-plugin-1.7.2
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.2
 2112201210 metadata/md5-cache/app-containers/docker-bench-security-1.3.3
 2112201210 metadata/md5-cache/app-containers/s6-overlay-2.1.0.2-r1
@@ -55639,12 +55805,10 @@
 2304050210 metadata/md5-cache/app-containers/apptainer-1.1.6
 2304051141 metadata/md5-cache/app-containers/docker-compose-1.29.2-r1
 2304051141 metadata/md5-cache/app-containers/docker-compose-1.29.2-r2
-2304051141 metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
 2304051141 metadata/md5-cache/app-containers/sen-0.6.1_p20200905-r1
 2304130410 metadata/md5-cache/app-containers/docker-23.0.3
 2304130410 metadata/md5-cache/app-containers/docker-cli-23.0.3
 2304130410 metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20230118
-2304180040 metadata/md5-cache/app-containers/Manifest.gz
 2304180040 metadata/md5-cache/app-containers/buildah-1.27.1
 2304180040 metadata/md5-cache/app-containers/buildah-1.28.0
 2304180040 metadata/md5-cache/app-containers/buildah-1.28.1
@@ -55699,6 +55863,8 @@
 2304180040 metadata/md5-cache/app-containers/syft-0.75.0
 2304180040 metadata/md5-cache/app-containers/syft-0.76.0
 2304180040 metadata/md5-cache/app-containers/umoci-0.4.6
+2304200810 metadata/md5-cache/app-containers/Manifest.gz
+2304200810 metadata/md5-cache/app-containers/docker-compose-1.29.2-r3
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-adamspiers-20210426
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-alexbarton-20210416
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-antoniodiazdiaz-20220406
@@ -55806,7 +55972,6 @@
 2212282210 metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-commons-20150603
 2212290340 metadata/md5-cache/sec-keys/openpgp-keys-tor-20221213
 2212301240 metadata/md5-cache/sec-keys/openpgp-keys-vgl-turbovnc-20221229
-2301151310 metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
 2301202010 metadata/md5-cache/sec-keys/openpgp-keys-apache-xalan-c-20221123
 2301292040 metadata/md5-cache/sec-keys/openpgp-keys-stellarium-20221229
 2301271540 metadata/md5-cache/sec-keys/openpgp-keys-valgrind-20230124
@@ -55833,8 +55998,11 @@
 2303311510 metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
 2304032240 metadata/md5-cache/sec-keys/openpgp-keys-spamassassin-20221226
 2304071140 metadata/md5-cache/sec-keys/openpgp-keys-apache-xmlgraphics-fop-20150603
-2304081010 metadata/md5-cache/sec-keys/Manifest.gz
 2304081010 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20230403
+2304201010 metadata/md5-cache/sec-keys/Manifest.gz
+2304201010 metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.8
+2304201010 metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.88
+2304191010 metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.74
 2302242210 metadata/md5-cache/app-alternatives/Manifest.gz
 2302242210 metadata/md5-cache/app-alternatives/awk-4
 2302242210 metadata/md5-cache/app-alternatives/bc-0
@@ -55845,4 +56013,4 @@
 2302242210 metadata/md5-cache/app-alternatives/sh-0
 2302242210 metadata/md5-cache/app-alternatives/tar-0
 2302242210 metadata/md5-cache/app-alternatives/yacc-1-r2
-2304181440 metadata/md5-cache/Manifest.gz
+2304202110 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7442ed948ede..9d7b096a56e5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Apr 2023 12:00:01 +0000
+Thu, 20 Apr 2023 18:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e0221e112c1b..8be66d567d5b 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-790927a7ccf40f62ce7b5f62ddcd88f69ca83d76 1681817437 2023-04-18T11:30:37+00:00
+e6cee38fceb4d49e92468fddb0020e838041d2bb 1682012566 2023-04-20T17:42:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 382e52ffb540..0fbab6a7a953 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1681818001 Tue 18 Apr 2023 11:40:01 AM UTC
+1682014201 Thu 20 Apr 2023 06:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f89790580ce7..beb32d4cd6b1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 18 Apr 2023 11:39:51 +0000
+Thu, 20 Apr 2023 18:09:50 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5cd1d2a41e46..898e4f19c934 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest
index de017e241d73..96988615de0d 100644
--- a/net-analyzer/flowgrind/Manifest
+++ b/net-analyzer/flowgrind/Manifest
@@ -1,6 +1,3 @@
-AUX flowgrind-0.8.0-fno-common.patch 744 BLAKE2B 8b7f9f61b875a69e0087c526be21bb0c9cc917c38072b1dda47c77d3e5aa9ba9176742314ead8c03b9cb11e9552e78823f85f6d868f7210b3cd86db5f3df5789 SHA512 98ad53bffd36a7241c4091f5bd86699a699c0edbd4044ffc5861118fcde71ed17278ae3bb56ca95c9444eca04394a592bfce2c1dea35b1574d7fd42568b1797f
-DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a
 DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b
-EBUILD flowgrind-0.8.0-r2.ebuild 858 BLAKE2B 1c009318c2cc1da1f7302c99293daf47d0d0dbaba8d3b28bf834ce4111ccfcc4bd15e25c6122c8e3c0bb6f43dfe865deba9e8256edc504a1072e28e35923d9e4 SHA512 3d5cf63b1393e44aded1fb03de87fc8e4203301dc5450e129a568e2d87d9a309a2023b571e1f7b718de876973905cd592059fb3e7943c2cdfc453307b1347bc7
-EBUILD flowgrind-0.8.2.ebuild 793 BLAKE2B b7a388a797adb67ade440d06d85487c2d8184c7c3a4845c8329e0be01919968268ed477a1ae7b0aadce336860c493faebc937df30524bede90c2ca6c6b849d3a SHA512 d82bbdac31b5ef1cb059f805d2c9b5ede8f17d926badd49d19a29d6ef6bf7587964316fbc6d939ce9f6a0278e18e0c916d243377c9d7ced29257e47be10be907
+EBUILD flowgrind-0.8.2.ebuild 783 BLAKE2B 351ab30347e016bb697cd9e68022f0e0dc75b5eebfbfc382be6fe062907530d057e7c0ec36eca03ec4636481851eb49c259e69be5f631181d5ba17feef341d9d SHA512 bd5c60e63a7158b9f93145c4872bf6c0cb063afdd2b14db979b178739c676b3a15d68d942998988c4c38e816828597036140f4776b0399dfd011d3e41536f36f
 MISC metadata.xml 473 BLAKE2B 4d0cdeb61e4d8eb2f19305f9daf9c63a997f10ba1325444b59a66141612bc8d4ec5469151ebda8ffd6af227037fec032e8f256cecfd826b832a34495e1002884 SHA512 b4e6e82bd5d4b4f54784184b81d87e4652579233bd351f65d55d02e34a93cce537267de17dc814726ffbc97bbde8d627234502ac6c1864ea944f0be563a056d9
diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
deleted file mode 100644
index 60835b858816..000000000000
--- a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -86,6 +86,10 @@
- 
- int daemon_pipe[2];
- 
-+pthread_t daemon_thread;
-+char *dump_prefix;
-+char *dump_dir;
-+
- pthread_mutex_t mutex;
- struct request *requests = 0, *requests_last = 0;
- 
---- a/src/daemon.h
-+++ b/src/daemon.h
-@@ -252,7 +252,7 @@
- 	int num_flows;
- };
- 
--pthread_t daemon_thread;
-+extern pthread_t daemon_thread;
- 
- /* Through this pipe we wakeup the thread from select */
- extern int daemon_pipe[2];
-@@ -268,9 +268,8 @@
-  * large a reply can get */
- struct report* get_reports(int *has_more);
- 
--/* FIXME: shouldn't be global? */
--char *dump_prefix;
--char *dump_dir;
-+extern char *dump_prefix;
-+extern char *dump_dir;
- 
- void *daemon_main(void* ptr);
- void add_report(struct report* report);
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
deleted file mode 100644
index d8639d6fa32e..000000000000
--- a/net-analyzer/flowgrind/flowgrind-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network performance measurement tool"
-HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
-
-RDEPEND="
-	dev-libs/xmlrpc-c:=[abyss,curl]
-	sys-apps/util-linux
-	gsl? ( sci-libs/gsl:= )
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_with doc doxygen) \
-		$(use_with gsl) \
-		$(use_with pcap)
-}
-
-src_compile() {
-	default
-
-	use doc && emake html
-}
-
-src_install() {
-	default
-
-	use doc && dodoc -r doc/html
-}
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
index 6560928a5f0d..b49cce5aa66e 100644
--- a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
+++ b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc gsl pcap"
+IUSE="doc gsl pcap"
 
 RDEPEND="dev-libs/xmlrpc-c:=[abyss,curl]
 	sys-apps/util-linux
@@ -21,7 +21,7 @@ BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
 	econf \
-		$(use_enable debug) \
+		--disable-debug \
 		$(use_with doc doxygen) \
 		$(use_with gsl) \
 		$(use_with pcap)
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 3c0175d0b185..0c2888644f22 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,9 +1,7 @@
 AUX icinga2-2.13.6-boost-1.81.patch 3325 BLAKE2B 8eda4f4ff774baafcdbb12d6e0ee978f3d12bfd659a5662ef0613512b299530fe4ea8afc50114f24e8698797443430da5d6b2774da08004b7f0d4889463bcaaa SHA512 00f0332a7cbdf205f6f01d5fcebb182ce0b0d68d5038a6646c6b76fbfe5416daa59f7bad9e8bf312f5ccb5c39ae4fce6888dc35718acca8b84cddee0d6d28f11
 AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
 AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc4786bd2705f94c70a03b84f34a55435f6d9dfcc0483e35da60c1f536dec1060bdc232108c622e0615 SHA512 a43911717fe891e70690647daa57426f70d10f9cb02c721962be4c13cfe8a95bc3ff84b9ba2a293adafc8ddacf8ea6771bd66e7ff6dabe3e732176bf6e6e474a
-DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad SHA512 5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
 DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9 SHA512 233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357
-EBUILD icinga2-2.13.6-r1.ebuild 4033 BLAKE2B a4e8f10d6dbe72a2d7432e56a6dc0caffdbc9ab5831b52df963bc9369b630010938e1f2f669c73714c40dd63f0e44300c58f5d7044b486c70447eab651c524cb SHA512 62c3e63c711ea16d0081f1b0be4610b6f1d19d613d18cf733ffb751894e75f272d8c22354f30792c391d38626cd72a52ef81c2adbed785717dff5eeda1ab85ef
 EBUILD icinga2-2.13.7.ebuild 3983 BLAKE2B 2cd06a8f2c034dcde4dc6c4c21e32f381d17e212137616d77463888cd253bfcec984c8ce2030d796bad79087cbe66a5d75d6cbf4d85f4358255340032619c0ab SHA512 627525a59a930b3ccdec516c8cae764fe7968eaa7b39ba9940bf561aa3665c8794fcdaac32157e53588901f67ee6a923daeeaeb576f8df46d02a24153eb138cb
 EBUILD icinga2-9999.ebuild 3889 BLAKE2B a0cca6d2dd0116dd86ec0f6af26ce1716aea33ca7e16c1b50769c121299fdbea5242fcf9aca3cc2532275ac0f7426134a7487c6273aa851575df85a0b80bfd7f SHA512 df7d83bda8910fe743dcd4467e2c7ec9bf2b97682dabc9cd5f99d1c1dc6ddfda5f555e26139c6bba104e933015a93066a202fe6e091222c082b3745dbbc75f1b
 MISC metadata.xml 871 BLAKE2B ffd6aeebf603ed90bfa4cc34d557e947e435d204c84e062532cedecd3e811710d9bd39f9f43dd70afd575104be5661b5f7e7de3f79365a961d45f61835a602c6 SHA512 3ca0916252061c1705d194066a30a8fc19cfe4341911646b7ed797e131e02f40eeddc91c2449a5b049888be749d16a5103e70678e5d6c1604db0ac3fe9f4e0d7
diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
deleted file mode 100644
index 6eb6102ef4c9..000000000000
--- a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-	dev-libs/openssl:0=
-	dev-libs/boost:=[context]
-	console? ( dev-libs/libedit )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	dev-libs/yajl:=
-	acct-user/icinga
-	acct-group/icinga
-	acct-group/icingacmd"
-BDEPEND="
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35"
-RDEPEND="
-	${DEPEND}
-	plugins? ( || (
-		net-analyzer/monitoring-plugins
-		net-analyzer/nagios-plugins
-	) )
-	mail? ( virtual/mailx )
-	acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.81.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-		-DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-		-DICINGA2_USER=icinga
-		-DICINGA2_GROUP=icingacmd
-		-DICINGA2_COMMAND_GROUP=icingacmd
-		-DICINGA2_RUNDIR=/run
-		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-		-DUSE_SYSTEMD=$(usex systemd)
-		-DLOGROTATE_HAS_SU=ON
-		-DICINGA2_LTO_BUILD=$(usex lto)
-	)
-	# default to off if minimal, allow the flags to be set otherwise
-	if use minimal; then
-		mycmakeargs+=(
-			-DICINGA2_WITH_MYSQL=OFF
-			-DICINGA2_WITH_PGSQL=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DICINGA2_WITH_PGSQL=$(usex postgres)
-			-DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-	if use mysql || use mariadb; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-	fi
-	if use postgres; then
-		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-		docinto schema/upgrade
-		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-	fi
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	keepdir /var/lib/icinga2/api/log
-	keepdir /var/spool/icinga2/perfdata
-
-	rm -r "${D}/run" || die "failed to remove /run"
-	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-	fowners -R icinga:icinga /etc/icinga2
-	fperms 0750 /etc/icinga2
-	fowners icinga:icinga /var/lib/icinga2
-	fowners -R icinga:icingacmd /var/lib/icinga2/api
-	fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
-	fowners -R icinga:icingacmd /var/lib/icinga2/certs
-	fowners icinga:icinga /var/spool/icinga2
-	fowners icinga:icinga /var/spool/icinga2/perfdata
-	fowners icinga:icingacmd /var/log/icinga2
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-pkg_postinst() {
-	if [[ "${PV}" != 9999 ]]; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${PV}" -gt "${v}"; then
-				elog "DB IDO schema upgrade may be required."
-				elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
-			fi
-		done
-	fi
-}
diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest
index a12267a04338..5bd83058fb04 100644
--- a/net-analyzer/nagios-check_multiple/Manifest
+++ b/net-analyzer/nagios-check_multiple/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2
-EBUILD nagios-check_multiple-0.0.1-r1.ebuild 1358 BLAKE2B 305338ed1e2bf6e06cd33a5010e233202a90ca3cd3360d4c74c20b7d3319266b750d7d2c5471d521b20e813d821338405a226dbb6b2b3fc13d66c7ef45c81f66 SHA512 da62c6d9704a554ceefb56a0160954f9e4cb2383559f8da4a0ca90a3122a6e7047ea3cadfa21ca9d778fc439df8626c9869227fb86ca1c50ed3bfefe5c0c4b08
-EBUILD nagios-check_multiple-0.0.1-r2.ebuild 1368 BLAKE2B e68b4a2a7ee95207efff60906f47e08a76d9eec2e22af524a53342f296e47361c10f99fb4438a6de00145816eaefc38fd8fc478fc684afa630bf4abbd6f42c68 SHA512 bcf13502d9e467963145fdd1d2b8df60ffd3b15ce5905eae87cf01d38f6f0ac91a38ca855f2742525cde7732963b868cb79120d55366cfee42187ec0cd90e3c1
+EBUILD nagios-check_multiple-0.0.1-r2.ebuild 1367 BLAKE2B df32a3635acd626b17142fe07b968893895e1a591250b7dd053593d105f014dafe04d9e0171fbefc71b132402f1095258783593a564d3a5678851acb10144065 SHA512 2d61c3506e13fcbf5a81e47d3bd79af49a6ed3c3a76bda35d5d50a2e1b0444c24d234e35987f9f1fefb60f30f7435bf3f7aa58c52268320fba688a0c8a1b2d92
 MISC metadata.xml 347 BLAKE2B c25107d223ed89498730678d4338d8c6bdef7693a86418fd80ebcbe48b0ca7a250af6740abaa20be36b9be23490c16e52d0bc2ae20901b93c05b97222526ad83 SHA512 4f246f7fc5e6af8898c19b653013ac167107f3663aa93dbee5186f7a1740140bd01d26208347c03cdd0526639be28245d8413cb4560a1a2ea90c565729c7ee35
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
deleted file mode 100644
index 009545a959b7..000000000000
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_multiple"
-DESCRIPTION="A Nagios plugin to execute multiple checks in parallel"
-HOMEPAGE="https://github.com/clarkbox/check_multiple"
-SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \
-		|| die "test suite failed"
-}
diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
index 8821327435cf..d5e64ac02fa8 100644
--- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
+++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index ea6dd5a30dc2..68bc55c62d26 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,4 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1-r2.ebuild 1201 BLAKE2B 4870e01efff48b49dfbf4d6cd33f9805e27c25a84c6c6a70594430a5ef30531d4b6ce4b3c1644d7d76473ec7b355c80dd5535c5d0b560029ed1309beecf569dc SHA512 f45e1bc2d409c24696ee3330aded8989f824e1b27c52cbaee687b55d11c454bbc80158fe7d4af2f51cc499257ae88cfacd7a9e6ed64794f03305226ddcc0ab8d
-EBUILD nagios-icinga-openvpn-0.0.1-r3.ebuild 1217 BLAKE2B f6023bf507b282f11e7d0e5ecc66717660b8887fef450876b18aec5dfb24851628110360337406afa8d51c42f0290216b8fea0521429997a84d9201e86651055 SHA512 3c7c823ea52f00012dd251b06797fb1df824b2468ab0229c4a855a85db550a5134ce27ea5cbcb419236661993ed22ed1bf1a0c77bccbddf39948433197fb765a
+EBUILD nagios-icinga-openvpn-0.0.1-r3.ebuild 1216 BLAKE2B b44deb18f610d3989d39e7499b721a453c0f856f9dd909daeaf4044cb843c980679dabfcc14639d3af587aaad4da62ab1bad57475b2be622fce9af83cbe1f717 SHA512 c31316d675b843a7c48c87ce4986415f71f4a5303ee43f2fee861bf9bab7769d56fca36f64fd29a4948dc3c2aa955ab161dbdb2ed472fe5f3b94cfbbb75737c2
 MISC metadata.xml 352 BLAKE2B dd1dd8a4b5a742cd5e7ec46a22748f01d56ce26fa0d3d1a855bf0699db64cd5fa181306ac9528991572906ac89c6125bf6d10e97332bc148996cac14f5cf83d5 SHA512 3930012be14153b9cba53af2fc2edce373e1a279a5364c3cebcc472dfdbd7f544205145e842630da210b75d6c8cd34d9bb6b91403ed1a51e4b5c99061c31e1ca
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
deleted file mode 100644
index d16004eadc12..000000000000
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 python3_10 )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-MY_PN="check_openvpn"
-DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
-SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-
-	local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins"
-	dodir "${nagiosplugindir}"
-
-	# Create a symlink from the nagios plugin directory to the /usr/bin
-	# location. The "binary" in /usr/bin should also be a symlink, since
-	# the python machinery allows the user to switch out the
-	# interpreter. We don't want to mess with any of that, so we just
-	# point to whatever the system would use if the user executed
-	# ${MY_PN}.
-	#
-	# The relative symlink is preferred so that if the package is
-	# installed e.g. while in a chroot, the symlink will never point
-	# outside of that chroot.
-	#
-	dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}"
-}
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
index 29bd4732ec09..0dc7a05fc33c 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 src_install() {
diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest
index ce04655a0612..b079bd4a68c9 100644
--- a/net-analyzer/sngrep/Manifest
+++ b/net-analyzer/sngrep/Manifest
@@ -1,3 +1,5 @@
 DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3
+DIST sngrep-1.7.0.tar.gz 248947 BLAKE2B 39a5d9bc71df9fb5bd4abadadf3f8fc8a680dd06eb4a7f06bb597a70215854d0ee4b93b39cfff67e2b15b6fed4ffac2865741af31b21a7ba8a91f9c01c4c750a SHA512 ecf31d61643ecc9ba1a9fe7759ae8c2c65fcbf6886ed263def2993dd6900eb9aeaddce8ebbde71e1ec57fbdc11a388de05f7c13f4587714e3b3e33689cf591b0
 EBUILD sngrep-1.6.0-r1.ebuild 878 BLAKE2B e65118d52a01866a4cbb8484deac943bca129b80ead7335de22aa333bb1fa2a56c755cc9ab9253b27bec6c281d12541df999b6ce9743a493780d2ea9ec7c92af SHA512 2dc5e5ff66dd11633f6494e44431a7f1652c8bfae970351082e5556c213cf55779e577e235635806a164abdf65d6b6db68b688a062d0c899efe341a8cbce39e2
+EBUILD sngrep-1.7.0.ebuild 878 BLAKE2B cf757d29c925926be7728f80bbde828046d5039ecd3b04756de53dc188bae303c9b1e8114a1cdf684916a94cfa4907e422dc0bb3c003e47952d2691817e9dca3 SHA512 c04b8cfeb08b41bc90351cc0f9c706e629e99b3ce92f6e87e6ad132f9fc9d7f74e0558e4b794a48d6b22dd24e381df8ec5c1b3c44657a347a848afaff1b7ddb4
 MISC metadata.xml 468 BLAKE2B 7b8e43ef6cb3bd733bc3321a2f5436b43bd846def6ac09d648e09bfe412a2cbb8f2b8d26cdb2721a2e44c33a183c4ab1d60e5fc9f899d7b8bbc0beac4e19abf5 SHA512 f6614eac2fdb609c8bd4ca7f3719b672a300ea52f96906c5ca6de204c345dbc80b5ec9e673046c24031b96118d0c70168c290fcdfda0063e7bd4493e6f7e58ae
diff --git a/net-analyzer/sngrep/sngrep-1.7.0.ebuild b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
new file mode 100644
index 000000000000..4ec90e3677e8
--- /dev/null
+++ b/net-analyzer/sngrep/sngrep-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Ncurses SIP Messages flow viewer"
+HOMEPAGE="https://github.com/irontec/sngrep"
+SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eep gnutls pcre ssl zlib"
+
+DEPEND="
+	net-libs/libpcap
+	sys-libs/ncurses:=[unicode(+)]
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	pcre? ( dev-libs/libpcre2 )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ipv6
+		--enable-unicode
+		--without-pcre
+		$(use_enable eep)
+		$(use_with pcre pcre2)
+		$(use_with ssl $(usex gnutls gnutls openssl))
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index d5e82f670862..b8b6679f0df6 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 277b959d58e5..95afb69b663b 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,14 +1,6 @@
 AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
 AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc010fda237b47d5a543225f54d7d4a8b00c1e15f904b149414c597525dd8b6425f20785ca636798d SHA512 acc9b0b178096e44ebfb84228caab1c82bf2f7bb38be386755169bbfb628165b6ac57194ed5a35e566dd0a2d8425f6790b43228a715e633ae8f59e2ab2b574da
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
-DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
-DIST freeradius-3.0.26.tar.gz 5300930 BLAKE2B e8922182f69ff201af331a03ef109072d24fb169c14179c5e71910ed3f767526afd7efe6000fd8a3881fa2ddb0487ebd12f8fdf6845136fdc15fdcb8a83fdf39 SHA512 83825ce1dd3d2e005c11d10ebadd2b37884130c158d3ea43595fa52478e3d194725b15dc73633758b0b1e916e00ea9358d254c38c2b721c475c9a4235aa1a5a3
-DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
-DIST freeradius-server-3.2.1.tar.bz2 3399164 BLAKE2B d0e69d468736d2a5dd85b32bb8b1fa44f2e56725ae525a3895df1b926f5ce525c70af08c2b76b62a9479d00d02c3e4915586fb1e5c7d42955c6b9e5cdeda8f6e SHA512 0f9e98cbf0eff4c5af54731ec34a8c9070252eaf2f91ca0c87caae939f6356fa91a6e1ed98ba66dbf1c1bafecdfcf38603fb4f65a5955e88974f49a5b7885f7a
 DIST freeradius-server-3.2.2.tar.bz2 3418998 BLAKE2B 584d1ff79cf3a75c79f5b24f9e47d7c8d8caee0d706eb47bb387300172f0699f904804d963aab8c252a21fe67f7885a47659b8cd9db5292a6d4db087d72e8e38 SHA512 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689
-EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 63f05fa3d9556b614f5b1f60e5b49876880757f648b1a34031e2647e8fe285aa1ac0888107c47344bca0f69bcc0187698a4296f83945e3cf2f8c9a86c8bffe12 SHA512 a0a7fcfddec67576dd3a5df61b844d1cb1d1f28935b97e3196074df2650d45be152facdf5df26d0f476ddc72a77d95e402543b84c23159c9fb74ab6caea15a81
-EBUILD freeradius-3.0.26.ebuild 7518 BLAKE2B a869e680f55f1fa1c02a366f293425123398e6ca1499c28aee3e53b6a17fd92d221bfcac7ded79be8e7891dc3ccc8e883f326c13ea2e97403b597d3c5cdeb6db SHA512 79735a74828928dacea3ecbdf371c2865b91eb3fbd57be3cc72f91ed4b55f4b79f4eda42f19cf43f71b5f67c461563e22b1cd762ef3bf3d9beae2c03fc230d66
-EBUILD freeradius-3.2.0.ebuild 8313 BLAKE2B d5a2314f7b780349240de777500770f2851ee72cc6683a6645340dd0f1a53a1aa14424956ac75576519cfe89927b88597f1689350c99eb460777365794a6f51d SHA512 c14101fe8d2bfb93f2206acd332b08b325253a9d8e76d167ab21f49f74ed0126682c16ec074a65e7dbbe6e09b7aed9cae45f36bc85a6f376e3da929453c6af61
-EBUILD freeradius-3.2.1.ebuild 8354 BLAKE2B a325035ef6e125e1e70c67f1cecf49f73c7faacbb71353297f1f70a3779f5cae0145def15931229116ce8d665d1b886c001998db3a314a80c2b598cd5e1955d1 SHA512 5aaf707ea4df676033644bfa34da17e0fb89e8c7a324bb73b2065be67458b0dafb290338ac4898c80acb25fe55bc28bc41537d3596944109a6f32a92271e9b71
 EBUILD freeradius-3.2.2.ebuild 8297 BLAKE2B d76dc490ecac214b216eff0a3b74e40f88fe3e3bb0f91344ab649da88a8d30b9e323428ed17350f937a7334f1e78273bd299e6f9ca605456897cf4650a4dab35 SHA512 c260d7ff7feb0324c1169e692dc82e86b627cb73b86ec300a794e15039d8cc7be6313f8d85e2de0f7deb823e74f6c9c3c81de8b325ba5a7b6bebac34a9976f7a
 MISC metadata.xml 754 BLAKE2B 2aaf6e500fe361f2c456ea4e4d9da51c3056d8c993725bd3372cc3ebfecec129b8196cecf4829083084d3c664c338569db75fd2304dfc9123e04db3b222642ed SHA512 b6e99eefac90938f55be7abd56604e5ba37bacbcde609f7f9c71deef4d80c6257404baa1b676f426d9182345d4b742591b677b64c016eabdfafb1b18eb2d35e9
diff --git a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild b/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
deleted file mode 100644
index 0218f364f4ec..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/freeradius-server-release_${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-lang/perl:=
-	sys-libs/gdbm:=
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	redis? ( dev-libs/hiredis:= )
-	rest? ( dev-libs/json-c:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	# most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-
-	eapply_user
-	default
-
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-	# Drop support of python2
-	rm -r src/modules/rlm_python || die
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# these are all things we don't have in portage/I don't want to deal
-	# with myself
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
-	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# sql drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag}; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# verbosity
-	# build shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		--enable-shared
-		--disable-static
-		--disable-ltdl-install
-		--with-system-libtool
-		--with-system-libltdl
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	use readline || export ac_cv_lib_readline=no
-	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# verbose, do not install certificates
-	# Parallel install fails (#509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# fix #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}/usr/sbin/rc.radiusd" || die
-
-	newinitd "${FILESDIR}/radius.init-r4" radiusd
-	newconfd "${FILESDIR}/radius.conf-r6" radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl; then
-		cd "${ROOT}"/etc/raddb/certs || die
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.0.26.ebuild b/net-dialup/freeradius/freeradius-3.0.26.ebuild
deleted file mode 100644
index a2e2c1dd3980..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.26.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/freeradius-server-release_${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-lang/perl:=
-	sys-libs/gdbm:=
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	redis? ( dev-libs/hiredis:= )
-	rest? ( dev-libs/json-c:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# 721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	# most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-
-	eapply_user
-	default
-
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-	# Drop support of python2
-	rm -r src/modules/rlm_python || die
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# these are all things we don't have in portage/I don't want to deal
-	# with myself
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
-	rm -r src/modules/rlm_opendirectory || die # requires some membership.h
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# sql drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag}; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# verbosity
-	# build shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		--enable-shared
-		--disable-static
-		--disable-ltdl-install
-		--with-system-libtool
-		--with-system-libltdl
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	use readline || export ac_cv_lib_readline=no
-	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# verbose, do not install certificates
-	# Parallel install fails (#509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# fix #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}/usr/sbin/rc.radiusd" || die
-
-	newinitd "${FILESDIR}/radius.init-r4" radiusd
-	newconfd "${FILESDIR}/radius.conf-r6" radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl; then
-		cd "${ROOT}"/etc/raddb/certs || die
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.2.0.ebuild b/net-dialup/freeradius/freeradius-3.2.0.ebuild
deleted file mode 100644
index 30a0e6a740ac..000000000000
--- a/net-dialup/freeradius/freeradius-3.2.0.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PN=${PN}-server
-MY_P=${MY_PN}-${PV}
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	postgres python readline redis samba sqlite ssl systemd
-"
-
-RESTRICT="firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-
-# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
-# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
-
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-libs/libltdl
-	dev-libs/libpcre
-	dev-libs/json-c:=
-	dev-lang/perl:=
-	net-libs/libpcap
-	sys-libs/gdbm:=
-	sys-libs/libcap
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-	redis? ( dev-libs/hiredis:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# bug #721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-	# TODO: shift more of these into configure args below as things
-	# are a bit better now.
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-
-	# Drop support for python2
-	rm -r src/modules/rlm_python || die
-
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	#use rest || { rm -r src/modules/rlm_rest || die ; }
-	use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# These are all things we don't have in portage/I don't want to deal
-	# with myself.
-	#
-	# Requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
-	# Requires libeap-ikev2
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
-	# Requires some membership.h
-	rm -r src/modules/rlm_opendirectory || die
-	# ?
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# SQL drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag} ; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# - Verbosity
-	# - B uild shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# Crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# Do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		# Revisit confcache when not needing to use ac_cv anymore
-		# for automagic deps.
-		#--cache-file="${S}"/config.cache
-
-		--enable-shared
-		--disable-ltdl-install
-		--disable-silent-rules
-		--with-system-libtool
-		--with-system-libltdl
-
-		--enable-strict-dependencies
-		--without-rlm_couchbase
-		--without-rlm_securid
-		--without-rlm_unbound
-		--without-rlm_idn
-		#--without-rlm_json
-		#$(use_with rest libfreeradius-json)
-
-		# Our OpenSSL should be patched. Avoid false-positive failures.
-		--disable-openssl-version-check
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-pcre
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-
-	# bug #77613
-	if has_version app-crypt/heimdal ; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	if ! use readline ; then
-		export ac_cv_lib_readline=no
-	fi
-
-	#if ! use pcap ; then
-	#	export ac_cv_lib_pcap_pcap_open_live=no
-	#	export ac_cv_header_pcap_h=no
-	#fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# - Verbose, do not install certificates
-	# - Parallel install fails (bug #509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam ; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# bug #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}"/usr/sbin/rc.radiusd || die
-
-	newinitd "${FILESDIR}"/radius.init-r4 radiusd
-	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl ; then
-		cd "${ROOT}"/etc/raddb/certs || die
-
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.2.1.ebuild b/net-dialup/freeradius/freeradius-3.2.1.ebuild
deleted file mode 100644
index 86036194b49c..000000000000
--- a/net-dialup/freeradius/freeradius-3.2.1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools pam python-single-r1 systemd
-
-MY_PN=${PN}-server
-MY_P=${MY_PN}-${PV}
-MY_PV=$(ver_rs 1- "_")
-
-DESCRIPTION="Highly configurable free RADIUS server"
-HOMEPAGE="https://freeradius.org/"
-SRC_URI="https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${MY_PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="
-	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
-	postgres python readline redis samba sqlite ssl systemd
-"
-
-RESTRICT="firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-#       libs also if code is compliant, will be available in the next release.
-#       (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-#       linking of samba library if -samba is used.
-
-# TODO: unconditional json-c for now as automagic dep despite efforts to stop it
-# ditto libpcap. Can restore USE=rest, USE=pcap if/when fixed.
-
-RDEPEND="acct-group/radius
-	acct-user/radius
-	!net-dialup/cistronradius
-	dev-libs/libltdl
-	dev-libs/libpcre
-	dev-libs/json-c:=
-	dev-lang/perl:=
-	net-libs/libpcap
-	sys-libs/gdbm:=
-	sys-libs/libcap
-	sys-libs/talloc
-	virtual/libcrypt:=
-	firebird? ( dev-db/firebird )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql? ( dev-db/mysql-connector-c:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
-	odbc? ( dev-db/unixODBC )
-	oracle? ( dev-db/oracle-instantclient[sdk] )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-	redis? ( dev-libs/hiredis:= )
-	samba? ( net-fs/samba )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.2:=[-bindist(-)] )
-	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# bug #721040
-QA_SONAME="usr/lib.*/libfreeradius-.*.so"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python-single-r1_pkg_setup
-		export PYTHONBIN="${EPYTHON}"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Most of the configuration options do not appear as ./configure
-	# switches. Instead it identifies the directories that are available
-	# and run through them. These might check for the presence of
-	# various libraries, in which case they are not built.  To avoid
-	# automagic dependencies, we just remove all the modules that we're
-	# not interested in using.
-	# TODO: shift more of these into configure args below as things
-	# are a bit better now.
-	use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
-	use ldap || { rm -r src/modules/rlm_ldap || die ; }
-	use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
-	use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
-	use pam || { rm -r src/modules/rlm_pam || die ; }
-
-	# Drop support for python2
-	rm -r src/modules/rlm_python || die
-
-	use python || { rm -r src/modules/rlm_python3 || die ; }
-	#use rest || { rm -r src/modules/rlm_rest || die ; }
-	# Do not install ruby rlm module, bug #483108
-	rm -r src/modules/rlm_ruby || die
-
-	# These are all things we don't have in portage/I don't want to deal
-	# with myself.
-	#
-	# Requires TNCS library
-	rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die
-	# Requires libeap-ikev2
-	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die
-	# Requires some membership.h
-	rm -r src/modules/rlm_opendirectory || die
-	# ?
-	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
-	# SQL drivers that are not part of experimental are loaded from a
-	# file, so we have to remove them from the file itself when we
-	# remove them.
-	usesqldriver() {
-		local flag=$1
-		local driver=rlm_sql_${2:-${flag}}
-
-		if ! use ${flag} ; then
-			rm -r src/modules/rlm_sql/drivers/${driver} || die
-			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
-		fi
-	}
-
-	sed -i \
-		-e 's:^#\tuser = :\tuser = :g' \
-		-e 's:^#\tgroup = :\tgroup = :g' \
-		-e 's:/var/run/radiusd:/run/radiusd:g' \
-		-e '/^run_dir/s:${localstatedir}::g' \
-		raddb/radiusd.conf.in || die
-
-	# - Verbosity
-	# - B uild shared libraries using jlibtool -shared
-	sed -i \
-		-e '/$(LIBTOOL)/s|--quiet ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		Make.inc.in || die
-	sed -i \
-		-e 's|--silent ||g' \
-		-e 's:--mode=\(compile\|link\):& -shared:g' \
-		scripts/libtool.mk || die
-
-	# Crude measure to stop jlibtool from running ranlib and ar
-	sed -i \
-		-e '/LIBRARIAN/s|".*"|"true"|g' \
-		-e '/RANLIB/s|".*"|"true"|g' \
-		scripts/jlibtool.c || die
-
-	usesqldriver mysql
-	usesqldriver postgres postgresql
-	usesqldriver firebird
-	usesqldriver iodbc
-	usesqldriver odbc unixodbc
-	usesqldriver oracle
-	usesqldriver sqlite
-	usesqldriver mongodb mongo
-
-	eautoreconf
-}
-
-src_configure() {
-	# Do not try to enable static with static-libs; upstream is a
-	# massacre of libtool best practices so you also have to make sure
-	# to --enable-shared explicitly.
-	local myeconfargs=(
-		# Revisit confcache when not needing to use ac_cv anymore
-		# for automagic deps.
-		#--cache-file="${S}"/config.cache
-
-		--enable-shared
-		--disable-ltdl-install
-		--disable-silent-rules
-		--with-system-libtool
-		--with-system-libltdl
-
-		--enable-strict-dependencies
-		--without-rlm_couchbase
-		--without-rlm_securid
-		--without-rlm_unbound
-		--without-rlm_idn
-		#--without-rlm_json
-		#$(use_with rest libfreeradius-json)
-
-		# Our OpenSSL should be patched. Avoid false-positive failures.
-		--disable-openssl-version-check
-		--with-ascend-binary
-		--with-udpfromto
-		--with-dhcp
-		--with-pcre
-		--with-iodbc-include-dir=/usr/include/iodbc
-		--with-experimental-modules
-		--with-docdir=/usr/share/doc/${PF}
-		--with-logdir=/var/log/radius
-
-		$(use_enable debug developer)
-		$(use_with ldap edir)
-		$(use_with redis rlm_cache_redis)
-		$(use_with redis rlm_redis)
-		$(use_with redis rlm_rediswho)
-		$(use_with ssl openssl)
-		$(use_with systemd systemd)
-	)
-
-	# bug #77613
-	if has_version app-crypt/heimdal ; then
-		myeconfargs+=( --enable-heimdal-krb5 )
-	fi
-
-	if use python ; then
-		myeconfargs+=(
-			--with-rlm-python3-bin=${EPYTHON}
-			--with-rlm-python3-config-bin=${EPYTHON}-config
-		)
-	fi
-
-	if ! use readline ; then
-		export ac_cv_lib_readline=no
-	fi
-
-	#if ! use pcap ; then
-	#	export ac_cv_lib_pcap_pcap_open_live=no
-	#	export ac_cv_header_pcap_h=no
-	#fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Verbose, do not generate certificates
-	emake \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
-	dodir /etc
-
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-
-	keepdir /var/log/radius/radacct
-	diropts
-
-	# - Verbose, do not install certificates
-	# - Parallel install fails (bug #509498)
-	emake -j1 \
-		Q='' ECHO=true \
-		LOCAL_CERT_PRODUCTS='' \
-		R="${D}" \
-		install
-
-	if use pam ; then
-		pamd_mimic_system radiusd auth account password session
-	fi
-
-	# bug #711756
-	fowners -R radius:radius /etc/raddb
-	fowners -R radius:radius /var/log/radius
-
-	dodoc CREDITS
-
-	rm "${ED}"/usr/sbin/rc.radiusd || die
-
-	newinitd "${FILESDIR}"/radius.init-r4 radiusd
-	newconfd "${FILESDIR}"/radius.conf-r6 radiusd
-
-	if ! use systemd ; then
-		# If systemd builtin is not enabled we need use Type=Simple
-		# as systemd .service
-		sed -i -e 's:^Type=.*::g' \
-			-e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
-			"${S}"/debian/freeradius.service
-	fi
-
-	systemd_dounit "${S}"/debian/freeradius.service
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
-	if use ssl ; then
-		cd "${ROOT}"/etc/raddb/certs || die
-
-		./bootstrap || die "Error while running ./bootstrap script."
-		chown root:radius "${ROOT}"/etc/raddb/certs || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
-		chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
-	fi
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} && use ssl ; then
-		elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
-		elog "to start the radiusd service."
-	fi
-}
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index fdde11d1af11..f8e6b5bb87ad 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -2,6 +2,5 @@ AUX minicom-2.8-gentoo-runscript.patch 1331 BLAKE2B 6e9ee88bec01054710bd60163fe3
 AUX minicom-2.8-lockdir.patch 431 BLAKE2B 536586d955557d8250b76f7cec1571d7c0f4f31d10eb713fe4ebc624ca90e88fef56ed3bbabb15be2ac35d60b4948e1bb641dac0b61c4ca4bad807cb5dd2c836 SHA512 765eabe70368475d323f898cf3c9f3d817f25b039a225d5284450600a895a284e92d7589b678b39010c429435ced00fb3f57506063242aa094c7c2551c533fcf
 AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d3c334825f05d89e75d9a613ac1c40a44bd1605cae8765d24a259212767e62fe3a6f8779b57 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c
 DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
-EBUILD minicom-2.8-r1.ebuild 1241 BLAKE2B c5928733fe05e822f81d3303f924717f5b35528843fc5fe06153c5e668da42afb30eed50ffb1665d815fc724157cdcdab114e307f4d83cbe9844c47b53345f75 SHA512 9f93f14003bd579fa5e0af442b33d574d3cf1240c6de0792b17412fd158c6f93badbb2ac6f4e7b7302bc61c78f44f7c58fc0ab3607dcb2801d524967258622ae
-EBUILD minicom-2.8-r2.ebuild 1145 BLAKE2B 1247b1b78d9f6ea01b0aa942524b66f2a540f248a71a42c2db5da15ab4c826b183786735d87e813e814a6fbf22b722af154645176180df65ca29cfffa52c63d6 SHA512 9bad923be7f17ee607938d37921b0fc3d1de4667380235cc50784c8fd3cf91b5aeed4186c4ffcf7982b6fae6c872f76899548458f16deb22f223019de3d2e806
+EBUILD minicom-2.8-r2.ebuild 1138 BLAKE2B 1ec5398039705c6951b3d4a76febe90c849198fb2f484b743386e3665a082756caffae85016b9a2c2e7e7fc8c502d2f9fd6900e12894b233ebb8c4e7d2310ea3 SHA512 81f42f706b1138167493e0b95c077833df26293b41dcdbfbb9b2e0934451318ed763bfb5c5e5b9b868ff48518333b16a8e16b5a563e394fb1f33ee31eb934219
 MISC metadata.xml 529 BLAKE2B 3b898729ec228a2557e80c69f47f73c4fa16e2cab7934c6c7792a8a4704fe7a428843dcc8e5c61416e0a3346e5f4dc3c932a6a72f15744ee530cc22c17145d2c SHA512 6a4a40a24146a5b33402ff508a47b0b159511930e564f3b4aad1b09016a48db7d1e127babe09d4ebee08321334ef669f3d48b9dc191f411fdf6766ae96131309
diff --git a/net-dialup/minicom/minicom-2.8-r1.ebuild b/net-dialup/minicom/minicom-2.8-r1.ebuild
deleted file mode 100644
index ee85c234711b..000000000000
--- a/net-dialup/minicom/minicom-2.8-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Serial Communication Program"
-HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
-SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-DEPEND="sys-libs/ncurses:="
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/lrzsz
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch
-	"${FILESDIR}"/${PN}-2.8-lockdir.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Lockdir must exist if not manually specified.
-	# '/var/lock' is created by OpenRC.
-	local myeconfargs=(
-		# See bug #788142
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-
-		--disable-rpath
-		--enable-lock-dir="/var/lock"
-		$(use_enable nls)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Needs to match --sysconfdir above
-	insinto /etc/minicom
-	doins "${FILESDIR}"/minirc.dfl
-}
-
-pkg_preinst() {
-	[[ -s "${EROOT}"/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
-}
diff --git a/net-dialup/minicom/minicom-2.8-r2.ebuild b/net-dialup/minicom/minicom-2.8-r2.ebuild
index 6a31287bdcb2..2a2544d4ec53 100644
--- a/net-dialup/minicom/minicom-2.8-r2.ebuild
+++ b/net-dialup/minicom/minicom-2.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 545c79514023..15cae6c33a1f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 67c19420ed8f..bbd53f0531e5 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,3 +1,4 @@
+AUX dnsdist-1.7.3-gcc13.patch 1970 BLAKE2B ac671f45112bb0b9d79c7385a0936382ea64d016220b759cbecd8ef268d34e4f5ffd59da25962303dcf59ea9abae4a9e78454cb3151691540f1b0d753b6a4f47 SHA512 6f7479425c7176717bc801c117af5a024399978183c0537977140735201f695ed6517f3a74ae7ba92ca323f25a50249d1e55b24564d93695c2ae8cf4a8fbd651
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
@@ -7,6 +8,6 @@ DIST dnsdist-1.7.3.tar.bz2 1379011 BLAKE2B e7d1cb9dba3d3ad1dd696d324697ffac60863
 DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
 EBUILD dnsdist-1.5.1-r101.ebuild 2260 BLAKE2B 6684dd21b7ffa954bce051a28d657aee28e230ac44193bb0b158a4739723ab430636b9d399e2de887a84a15eaee9ea9806272b547f1c15ff6ce3f7630060c81f SHA512 60eddcd719cadb629dc20737b33fc0cd4b0dbc1bb25203120ec2924618049d5b650eade36837db550fa82a6b5e78999f16c472b811e0943c6c2c8b20e9c4a03f
 EBUILD dnsdist-1.6.1-r1.ebuild 2167 BLAKE2B a61d12aef81bd6bb5f31b6d1cba4cec51befea7dbd07e163266595d48049e5aacb7cc57aef5f4518baab737f7535b25ea19c7d7cb5e0cb88d39c27a3919c5a95 SHA512 73a1d09809e21cd47779c7e8ca60fcabab48d4b26562ce08fd4a305365e421a2f27e9cc0c13123d9a036d3b9aa129d473e9958c776c1a0e8904237ff18424230
-EBUILD dnsdist-1.7.3-r1.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
+EBUILD dnsdist-1.7.3-r1.ebuild 2291 BLAKE2B 22557b7a46d9ebbdd7175a9ec45fa3dab45efdb6a492822f0d2d9b690a837920606c5c43ee1a5878f88b7673bac29e15360dad0d988efc3d61d93e9aaf4c3bd6 SHA512 88546d5480182f24d07b8159787091152814ce2c17d57eb6c46c77d879ba221a2d8f9974ee5aea2fcb2d3e2082333ceaac4a86bbc9d438c26558572fab8a5546
 EBUILD dnsdist-1.8.0.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
 MISC metadata.xml 1209 BLAKE2B 3a83a0be1b4d466d2436778b6212fda71ecf99aa00a6ad28bdeaec99ba86374585715ff477cc403247cdebeb7a99c8d91d064830e971ddd085fc3fd632393e21 SHA512 cc2a1468b6ea1e2a79b7655505b9a1c6d15354048df94ce3a406c84bc376664a46567d1c272e916e1692764495bf30ca4b26e1ad6d8801d03a57e9d4c2a95342
diff --git a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
index c0ec5088ac0e..72f5311ffcfb 100644
--- a/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.7.3-r1.ebuild
@@ -45,6 +45,10 @@ RDEPEND="acct-group/dnsdist
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-1.7.3-gcc13.patch
+)
+
 src_configure() {
 	# bug #822855
 	append-lfs-flags
diff --git a/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch b/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch
new file mode 100644
index 000000000000..339887ca4a19
--- /dev/null
+++ b/net-dns/dnsdist/files/dnsdist-1.7.3-gcc13.patch
@@ -0,0 +1,62 @@
+Altered slightly from upstream counterparts in order to make them apply to
+the dist tarball (updated context and filenames to match the dist).
+
+https://github.com/PowerDNS/pdns/commit/f407319cb7374baf06698786f4f39d431a36a3cc
+https://github.com/PowerDNS/pdns/commit/d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02
+
+From d8b4ea24dc5dbe7c53c24bfffba24bcae7f58e02 Mon Sep 17 00:00:00 2001
+From: Peter van Dijk <peter.van.dijk@powerdns.com>
+Date: Mon, 23 Jan 2023 14:54:09 +0100
+Subject: [PATCH] lock.hh: include <stdexcept>
+
+---
+ pdns/lock.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/lock.hh b/pdns/lock.hh
+index e8bd82988da..a08951a266d 100644
+--- a/lock.hh
++++ b/lock.hh
+@@ -22,6 +22,7 @@
+ #pragma once
+ #include <mutex>
+ #include <shared_mutex>
++#include <stdexcept>
+ 
+ /*
+   This file provides several features around locks:
+From f407319cb7374baf06698786f4f39d431a36a3cc Mon Sep 17 00:00:00 2001
+From: Sander Hoentjen <shoentjen@antagonist.nl>
+Date: Mon, 20 Feb 2023 16:51:07 +0100
+Subject: [PATCH] dnsdist-protocols.hh: include <cstdint>
+
+This fixes building dnsdist with gcc13:
+```
+In file included from dnsdist-protocols.cc:26:
+dnsdist-protocols.hh:32:8: error: use of enum 'typeenum' without previous declaration
+   32 |   enum typeenum : uint8_t
+      |        ^~~~~~~~
+dnsdist-protocols.hh:32:19: error: 'uint8_t' was not declared in this scope
+   32 |   enum typeenum : uint8_t
+      |                   ^~~~~~~
+dnsdist-protocols.hh:25:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+   24 | #include <vector>
+  +++ |+#include <cstdint>
+   25 | #include <string>
+```
+---
+ pdns/dnsdist-protocols.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdns/dnsdist-protocols.hh b/pdns/dnsdist-protocols.hh
+index c5c5743908d..bd2a4bb8ad1 100644
+--- a/dnsdist-protocols.hh
++++ b/dnsdist-protocols.hh
+@@ -22,6 +22,7 @@
+ #pragma once
+ 
+ #include <vector>
++#include <cstdint>
+ #include <string>
+ 
+ namespace dnsdist
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 0f5a4f8efe0c..46b86322051f 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index a03467e55c59..3ef6acce835d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -14,5 +14,7 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
+DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d
+EBUILD nfs-utils-2.6.3.ebuild 6104 BLAKE2B fa8ad0804b123ac9b1ef021349b61f68b6a62ab4de0b1278573b481346ccaacf69a3bce24ec07fc929cbfd4a96196f660df9d9829065fa8e409bd364301b34c7 SHA512 e43f10a71a428c8e676f966981367a767e5edee3b04f3560dc1d1555a29cee4b298cb85d100c9c88e8dc8f68e4840e06869d725ff75b64c47ce202ec3e7ffffe
 MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
new file mode 100644
index 000000000000..b95d66ce7f7f
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+# bug #315573
+RESTRICT="test"
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+COMMON_DEPEND="
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-fs/e2fsprogs
+	caps? ( sys-libs/libcap )
+	ldap? (
+		net-nds/openldap:=
+		sasl? (
+			app-crypt/mit-krb5
+			dev-libs/cyrus-sasl:2
+		)
+	)
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-db/sqlite:3
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+DEPEND="${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnfsidmap
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Our DEPEND forces this.
+	export libsqlite3_cv_is_recent=yes
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+	# SASL is consumed in a purely automagic way
+	export ac_cv_header_sasl_h=no
+	export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
+	local myeconfargs=(
+		--disable-static
+		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		--enable-ipv6
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Remove compiled files bundled in the tarball
+	emake clean
+
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. bug #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+
+	# Nuke after 2015/08/01
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+
+	# bug #234132
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	# bug #368505
+	keepdir /var/lib/nfs
+	# bug #603628
+	keepdir /var/lib/nfs/v4recovery
+
+	# No static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 3f1bd276bd27..7e266da0b782 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index fa1e45568280..950c919e9ebe 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,3 +1,3 @@
 DIST gftp-2.9.1b.tar.xz 872308 BLAKE2B 3588321689a1c6d8e0585e0439507f774b30e05630f774d7909f32fd66c289a961602b84cde97377de47d0c63fe4cf5452ec1e0b986c578958a6080cf5814fc8 SHA512 31d0aa4d3c5adf3d9ac2c2517402f9bdcab5fb1187df521a978acf41c1997a120797056dd1ca7bedc32e0dec0ac7c06c1790e47821660277fb6572205ce0fe93
-EBUILD gftp-2.9.1b.ebuild 760 BLAKE2B f3a1d5a2aa05765a04cea3c000b696a7bccaf446aba1957a682fba5f6686f9efc50cf853b50f8298432fee01ebb0781ae7547f75d2f1ee518147a0ad43049518 SHA512 1de4b44b10c1d1a91df521ffc7a6d33423c4d92d877a76a93201d236741159802ce431d150f59b36e7ef15480bbadf46d7867cb0bce05791f1b8f5ba0be7e3fa
+EBUILD gftp-2.9.1b.ebuild 828 BLAKE2B 3659ba22a765fe95d0349edbce31772d14d15b22157ba88f07d3d8a04f3414dfef20805c4b55f2e07452ab34631d79791f548c3b9ca71e75ebf672d6b7a5a233 SHA512 44fc949904bf830c47edeb2238782086ea520de438cf6c5e708f527550355c0cf8ca8b4d8b50e2769d81b46e76684a71f240221a9f6db992ab786ff8c6d74452
 MISC metadata.xml 341 BLAKE2B 3504d175dd66da9b28350de0f14e98343033da88bbf4ecb77870a7eeb698d06ea0bef99e5651dbc4e888eea7298849008d9704e5f7aabec418abf3f82e77a53f SHA512 922d619e58add72d27c869618ee979ee5e8680ec737392da0b4bc7ba83cd49ca4b041c7c2c83f4efa4e6de2c2499423cf3aaf3ea16517b48866ccb82884616c6
diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
index 331582efd380..184fb036ccd4 100644
--- a/net-ftp/gftp/gftp-2.9.1b.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -26,6 +26,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# Override gnome.org.eclass's S= (bug #904064)
+S="${WORKDIR}/${P}"
+
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable gtk gtkport) \
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3558d982b642..83e9a2a2ab5c 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index a6e416db1aac..3c3c9c34db8a 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST element-desktop_1.11.23_amd64.deb 86329464 BLAKE2B 1dfef4eeebc78b9bf61795d8e59fee4069484dcc4ec53cb6ecc077cbead0eb563ccb5e3c52b47c274e15afe9cf244808904dbd8f87b6d2608098c4eb8498e456 SHA512 6aad946b1398b3da0b5993883aeffaa08d9b3f5104759eda3379e4dc2586106358aad7d88ee4b1484e11606a36781f909f52d4bb12c3eeb421f84a94abc0732e
-EBUILD element-desktop-bin-1.11.23.ebuild 1963 BLAKE2B e843aa50d0998da1414493ad816142d88a5576a18bdf81e57cd0ad876b92ed96f9095d0775db3f582b7486d3258f3e5f375d76d28cc6236a7be3eaf889b53460 SHA512 4ca00093b9d031d33965fc661e09fcd075b48e3b1cfe2bd523d5ba733837cd5e5a57b7c8edfcebe19161caf51f9e0d335d91d3a7463ba7979dc84b8d09c5b4aa
+DIST element-desktop_1.11.29_amd64.deb 90337796 BLAKE2B 03118df614b06197e073c1f23c8434af9df491d1c441f5b314de929865e4ea6de8c6a2cac20506a061138105fa26c6f8f080c5eb757d17165a701b72571ce1a9 SHA512 7b8f96d34938eb42890c7cb5f344a1580cb4136cdc04f98ccceeeae89a9f325620143bbad17a9229016c16198fa54299f0025b0dda01693396433eade5f12ae9
+EBUILD element-desktop-bin-1.11.29.ebuild 1963 BLAKE2B e843aa50d0998da1414493ad816142d88a5576a18bdf81e57cd0ad876b92ed96f9095d0775db3f582b7486d3258f3e5f375d76d28cc6236a7be3eaf889b53460 SHA512 4ca00093b9d031d33965fc661e09fcd075b48e3b1cfe2bd523d5ba733837cd5e5a57b7c8edfcebe19161caf51f9e0d335d91d3a7463ba7979dc84b8d09c5b4aa
 MISC metadata.xml 248 BLAKE2B 88afa54e3134b10ecc3f3f7e19fb6b209f3908a517788151cfe6c6ced2b21d368f19a6de982c28575b14a8769069c02b70f639ab73618a9b949c0e9eaf4f17a0 SHA512 3ec152d35cfd434c4ba49a51afd5f2eeaed478983f49f5e61e0713af7da791faee69713a3740182302d8129fb538e8296d0b40152e23e7d5e6d1a996322e7122
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.11.23.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.11.29.ebuild
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d1fc5c98e0c0..4d515b79da6e 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 19c810bcdd2b..409ec391786f 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -8,5 +8,5 @@ DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e995
 DIST unrealircd-6.0.4.2.tar.gz 8698501 BLAKE2B e5252dc3e4b332adbbd5a2d435d5be14a7745777dd53b8fa72b79d4cba2c1c92c0f9381b62b9c3031f48347f2ce7086d44f619cb4ec1b4f3a4cd2020f391643b SHA512 2677834660f9e6123ddf5121d9a46908f6071070cc9da085884d6c6ccec9fefc5429effa2890527a1e162984f1c5cd57bcd9cd488e8713613af84fb6d507207d
 DIST unrealircd-6.0.4.2.tar.gz.asc 866 BLAKE2B cdfee99a09479d6099ef42e4caa05024b682f35a7d6302b1baa2ac4697b2b430856d9cbd00f0361360050ce5f2a0478dd9c6e1dbb86ec5714de24e5edcfeaeb7 SHA512 3bbad079c486bd072694f246306094a5cdfc7648f49a9ec40743453bec78173454667243a05870a8a19320b31843dfcd15d962d04758cf97cccd8854dbfdfea4
 EBUILD unrealircd-5.2.4-r1.ebuild 5491 BLAKE2B a82c2aab7db44a19a1d752434d86f092e90c7ac88931a45bf1c7f12d0459759eef445ba73d03f9ba828debe30b79d56bd4b2d0d828462f1b21799b883469ebe6 SHA512 ba0fe9538fdc7bf601e318b30b3529fcb0c5da14c71689c7e2fe6ce2e4465d74c6e72ec4aab2db1ad6a20d7267feba745a302c068f2542a278c72b984b4aaa5f
-EBUILD unrealircd-6.0.4.2.ebuild 5948 BLAKE2B 967806cfeb0a4eb8df73ab60fe00bd11f3c09298854516825bb8a11728c810e22bc9d769da715afc0a37f27e90cba1d574de186ff085d6d30dfea208e9b19561 SHA512 11c43244a9febe879a28b8f44c20f080f0a775a989dc4706073ab7f483e0e096f14c553d7b8989f8d2db977c1f08ed3cc298b50960f82cff1a64d7b853c131c2
+EBUILD unrealircd-6.0.4.2.ebuild 5943 BLAKE2B c64b58095d49d7fa08eafbcd4a9a6a9e34618543f35a5ce143ee6b9e295c48e8aa74711470cac4fd59fc5c5f118b658062ebd6fef78cc475a2782d2738b59aef SHA512 16056e6fa6ba58d6b51d0253cb632c3056753adb4c8d6224f1d659ae640032013c2d5a6f6647e9efe35acc93c9e32220e348f0ccb0f10d419eaf83276c6b99e0
 MISC metadata.xml 978 BLAKE2B 7149e20723b563c08f93a7383b4f934104c24c945a4cf07510a7945d418a824db990eec1fca839f67c739296e519e67033b4181c7fbf0761336053dfd68a1898 SHA512 926d227e04485b71ce6f6cce4f8addebd4479837d5b9f4bb412f391edd74d72d38aefbe9275bc2a45ee25117990ceeb796722f7753c082e987dc09d07c277987
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
index 17d16a6be9ce..b1ff6ae68729 100644
--- a/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
 
 RDEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index ea5941abc598..3d928fd58183 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 1316d9cd2c62..ddb508e45e10 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,4 +1,3 @@
-AUX std.patch 1370 BLAKE2B 51efb4b4df28b12553420c9ddb5dbd45194f90163318846fbbfd4faed9d41f8f1fd653c4aae39da823245a7d4597cbad37bf52e12b8f299e7d65cb5b92997881 SHA512 104f4696221cfd80372e1dbe1d8f732b305660683c74328a276133f1f04fd0cb02c720f19a9793a595f88a3ecbc155fc8b6fee41e628cb36d9dfe8552e78e42a
-DIST ignition-msgs5_5.9.0.tar.gz 338882 BLAKE2B 0eb2d3d54c0a290556dd78fed9b8d592045193cdba6291392517d7376ede7ce632ed8f72ddee792d3d0f998ea7c8279898dc39dd2f3e31cdda68b13cf0763000 SHA512 4bff89a2171e742ad07762c1f087815717e9b83ba50879560c6b014618398c44bdf23e1c20cd662e8fa3185de5dbacda95af1725c743c70a38a6d0b0c846d8eb
-EBUILD ignition-msgs-5.9.0.ebuild 668 BLAKE2B 74fa3092a1bf2633c5a451cbb90ce64ae76565ce1f859ffc6c80b4c57a4b25087382c8c209c4ede9247deb76ddf16e7b560b70a6c2883a8cbeadbd7fc950aec9 SHA512 ef8ad6c7ff068af789c0ad14166dad0a3fc00de0b906b8d3d9a9f125034b8679e3b42bc83ad4eae93fb32fbd7bcd45bfdddec3a6e8641f7ef9084ce6384130e2
+DIST ignition-msgs5_5.11.0.tar.gz 346560 BLAKE2B 87dd9c99f9d8bf8719f2968a89fbe9fd276d4b35f5a870eee0ab7476affdbca565fbdc7c3e5e94a29a21df6e7b6ace138a8db00ba838de6d8ba07478dd6a3456 SHA512 bbd71339c816947cbf91778303c4370e3d03b068421f0a043de3462d5eb691b16cbc3d19804cb353ad03f78f3e187af366e9d950fa05ebf22d0d08c565748bc4
+EBUILD ignition-msgs-5.11.0.ebuild 632 BLAKE2B 0775646b83928f7d4f7a6641bb66dac06bcc933362546449970c4e811a35707f9a6c549bfe0a42d6e2824c552e02f8987b7b47ead318964294f2c50531582bc1 SHA512 9c6e0d9e6076787c73d82fe4a4891705dbd4eefd2beaada86a766023f293e3a68a87874e95c359d0ca7fc30db688714b8cbcf8466d012f2c70739b38fa997092
 MISC metadata.xml 343 BLAKE2B 00262d03f9243dbaff38706a32cb99e9673414480d7141598846c9431f13600f5bec6a72917544e4ec0782bb11cdb77d31113c7dd41a97dfd439c824f5752796 SHA512 a19ed05b831b26062800346a5fa5ff3b3431fd2595e2603a0455c51923118a4293fc1db8c10aa456a4d71cacb6e6727dc5ee968932ff28532c51e285d1457ece
diff --git a/net-libs/ignition-msgs/files/std.patch b/net-libs/ignition-msgs/files/std.patch
deleted file mode 100644
index 2f795b08833d..000000000000
--- a/net-libs/ignition-msgs/files/std.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc
-===================================================================
---- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.cc
-+++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.cc
-@@ -67,7 +67,7 @@ Generator::~Generator()
- 
- /////////////////////////////////////////////////
- bool Generator::Generate(const FileDescriptor *_file,
--                               const string &/*_parameter*/,
-+                               const std::string &/*_parameter*/,
-                                OutputDirectory *_generatorContext,
-                                std::string * /*_error*/) const
- {
-Index: gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh
-===================================================================
---- gz-msgs-ignition-msgs5_5.9.0.orig/src/Generator.hh
-+++ gz-msgs-ignition-msgs5_5.9.0/src/Generator.hh
-@@ -44,9 +44,9 @@ class Generator : public CodeGenerator
-   /// \param[in] _generatorContext Output directory.
-   /// \param[in] _error Unused string value
-   public: virtual bool Generate(const FileDescriptor *_file,
--              const string &_parameter,
-+              const std::string &_parameter,
-               OutputDirectory *_generatorContext,
--              string *_error) const;
-+              std::string *_error) const;
- 
-   // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator);
- };
diff --git a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
similarity index 89%
rename from net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
rename to net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
index 326c0a377f89..552d7c3fb165 100644
--- a/net-libs/ignition-msgs/ignition-msgs-5.9.0.ebuild
+++ b/net-libs/ignition-msgs/ignition-msgs-5.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,4 +23,3 @@ DEPEND="${RDEPEND}
 BDEPEND="dev-util/ignition-cmake:2"
 CMAKE_BUILD_TYPE=RelWithDebInfo
 S="${WORKDIR}/gz-msgs-ignition-msgs5_${PV}"
-PATCHES=( "${FILESDIR}/std.patch" )
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 1823eedede53..ef8d854dbcdd 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -6,6 +6,6 @@ DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1
 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
 EBUILD ldns-1.8.0-r4.ebuild 2970 BLAKE2B daf7f3e9d06f4d45861278b75951e5eb1792f8d721229dbb343d2c6e41fe7ba28a21bea5f46a456fb94edab312a7b35a620dd115e02ecdfd59c8755a8cf23885 SHA512 05c6fdfad9784b3bd38d52bb6ac2f09617a109ddd3c24ce99ac57f5c52270da6ce229b9c1d2bb886b9109dc112a7596bb24355ced8b3f9cfb2983bd24b672f8e
 EBUILD ldns-1.8.1.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926
-EBUILD ldns-1.8.3-r1.ebuild 1950 BLAKE2B 7ab31084b83d4973a998f38b85c7495bea28a55340d6792fc3254865ceaba51e61ed7b86a73a659c070535ede41b36dce2e5ac4152cce178b12b8be45807d8f5 SHA512 99dd8bf2a9beda73348dda98cb89dd95dae896376c741caeffb0e5b31a477764b91d3a83a2f659144c59b39be2e0921ece4e7cf155140ec79bb48341a38aa100
+EBUILD ldns-1.8.3-r1.ebuild 1942 BLAKE2B 52da64d464f7973f4222bc37c85b595ed3b948e93c6621001b4e2f6c4670513bdbe6b9597f947eb980f134080ad4d861aedcfc42989ac3a500206dc44e695355 SHA512 f6c2746715b1995ea7f648b076325472714194e699fd44aa87ffeb9564f8934a0e07d3efdb095e85b798226d00c9c6f0ed95f0f8a641328378f86bb96418f359
 EBUILD ldns-1.8.3.ebuild 1949 BLAKE2B e250146286fab7c4b498288c769cbdbb7391d56aad00a1854bd73a2e35827dbd6935de52584fbf22292c878327e5eb0df7bbeef3e611ff1482b1d9d1ccd33c62 SHA512 4c6b2b302918f9ab4ed8ab6a8f5eb31feb73f153e95543fced9669836e73bc93575dc650602069594f02a45e2c50b46d098b0a7ccfd386ba486a5d4de35e6e2a
 MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/ldns-1.8.3-r1.ebuild b/net-libs/ldns/ldns-1.8.3-r1.ebuild
index b6b2d28818e4..acb50358cb16 100644
--- a/net-libs/ldns/ldns-1.8.3-r1.ebuild
+++ b/net-libs/ldns/ldns-1.8.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test" # missing test directory
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 9b2f787aeaf5..2cd4d1f7eb3e 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,4 +1,3 @@
-AUX libmicrohttpd-0.9.73-test-ssl3.patch 1227 BLAKE2B e4dad13af373f4ae5fb28fd94cd77fd86a261b2834a3636f328bc99188bfeb367f351f94bee0486716d91ed125ba913e34b891f4396aa58760391b4bf7a7cc32 SHA512 244ca6d634ecc44f0a4f3e433141a0dbefb72920b3fe29eb525a124e53de7c5c49a13f0f0400eff35274994a75c3f8c850558dca15b8e7121ee559fe1c17da8d
 AUX libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch 2078 BLAKE2B c3a7882d6e340c29fb26dce1c08ee2bf13a7fec0dfaa2b02c4f12afaa7d1ac0c610e33867b44f053db757188d160c57eedd55a77f1bcbdfcbf7d957ffcd81489 SHA512 b19c93b5139bfd50f7ab05c3a586a0d1ecb2c3e67b4f57eb48d1c0839dac44e860b699df6812f40563891435ba47b124fade74703d72c7f345c15dc367b3a0ce
 DIST libmicrohttpd-0.9.75.tar.gz 1952076 BLAKE2B 419d7b7113edbcc54eec3e3b6da92d040e15b451bde4e1372b368fdd87277c85daddc295bc71d25bf02135921a8716876e9536c9dee286fa29b66bfb8167ebd2 SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
 DIST libmicrohttpd-0.9.76.tar.gz 2199858 BLAKE2B 2c2de77d731ff130bb1491733b91e9e0b0c68bc30ea1a826f7f1d97aaf83fa7f6bec3c219f81c5293de72595b26d1e6eb66cdd4bfe3b16bd37a10e3acd3c6446 SHA512 9ff8a837892142376eaeaf50c0b0dba76697d0ff44b908434cba8db4324c57dfb8bbcc1a922b97d825891ac10f50693dee9388531856e0fa81fa2cfeac538581
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch
deleted file mode 100644
index e8d5dce0edcb..000000000000
--- a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.73-test-ssl3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- Disable usage of SSLv3 in testing
-
- Integrated uptream version 0.9.74
-
-
-diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
-
---- a/src/testcurl/https/test_tls_options.c
-+++ b/src/testcurl/https/test_tls_options.c
-@@ -119,11 +119,6 @@ main (int argc, char *const *argv)
-     fprintf (stderr, "Curl does not support SSL.  Cannot run the test.\n");
-     return 77;
-   }
--  if (0 != strncmp (ssl_version, "GnuTLS", 6))
--  {
--    fprintf (stderr, "This test can be run only with libcurl-gnutls.\n");
--    return 77;
--  }
- 
-   if (! testsuite_curl_global_init ())
-     return 99;
-@@ -152,10 +147,10 @@ main (int argc, char *const *argv)
-   fprintf (stderr,
-            "The following handshake should fail (and print an error message)...\n");
-   if (0 !=
--      test_wrap ("TLS1.0 vs SSL3",
-+      test_wrap ("TLS1.1 vs TLS1.0",
-                  &test_unmatching_ssl_version, NULL, port, daemon_flags,
-                  aes256_sha,
--                 CURL_SSLVERSION_SSLv3,
-+                 CURL_SSLVERSION_TLSv1_1,
-                  MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
-                  MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
-                  MHD_OPTION_HTTPS_PRIORITIES,
-
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 895b8456972e..5d28d6b8ad1b 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8e0b1e5ee072..59c655aef8cc 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -7,4 +7,5 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed
 DIST dovecot-2.3-pigeonhole-0.5.20.tar.gz 1945126 BLAKE2B 6845896f9bcfb26f74b0ecbc8109cfc2cd67492742aea2459cd74695d165c6009552b7178f370e06281440270829decc3f5fad9590b984ca3ff10267f4cf3e02 SHA512 45683e6bd678db00fc3e3c61d27a264d30d0e9aeb9ceb7ab55f94f0317d387056fa092e266062117cbe2a9dc2c90ddca03d154e78aad9c0d61fe8cf2c9187603
 DIST dovecot-2.3.20.tar.gz 7805735 BLAKE2B e041c68a8c2b4b1068f526554d92caa5806a4d3854cc4a287633e4702f764b68922e368426b1bb395c9dab92183e9568f8c8b6ff5491a39f1a28e818be1afec8 SHA512 20c5a9cacf2c22d99d46400b666206e5b153c35286c205eec5df4d2ce0c88cf29ea15df81716794fd75837f6d67dfa4037096cf4bb66f524877a9a0a6bb282c8
 EBUILD dovecot-2.3.20-r1.ebuild 8665 BLAKE2B 2b438a509e9c954b9f731ec8f71f8e1601d3d0e9ceea602d3c2245cd92fd78edfacbff3a17580a34f80929cd6c623a46ba2dd7b675c666224e39c5ebfcd70f8f SHA512 0499f4d65287fb6274b32f7b12a2a66efaeb35c72fbff9f67cdbf569e7a7d24ad5ff22f4eb81ac19a18c34774e66ef07156d000e0e8a6e17687d11522becf432
+EBUILD dovecot-2.3.20-r2.ebuild 8676 BLAKE2B c15fe5c43a1d9ac0b6430cefe5cf233cb8874517789b4692c9b4c8de51ae5348d8f1f2aa598c5b31457f55597342bf7ab50e5dbb343af5757a3537bcf17eeedf SHA512 908a471a114d580205b97855a46ab6f17e092bf2869edff023fc43578e2b7777b70ac9374b3533a10d27d5cb778a1fb57025803edd79e660cfb3d1d994a92cae
 MISC metadata.xml 965 BLAKE2B e0264c2ddea7b7b63647f3bacd999f164756808acea88d1e673dd381bedd72e915d584540def84f3f4cf35fc4d9e172da1cdd0c97cc49027e164bfa2780a1122 SHA512 c7ccd95428b3cdbac8486c30ff02ae13c07c5343fc2307747fcd714285408ee21dea63b51252f55a3b8255ff39890f02b2eca932fd5b457f02dc89739acc6680
diff --git a/net-mail/dovecot/dovecot-2.3.20-r2.ebuild b/net-mail/dovecot/dovecot-2.3.20-r2.ebuild
new file mode 100644
index 000000000000..70ed7036f50d
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.20-r2.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 lua5-3 )
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.20"
+if [[ ${PV} == *_rc* ]]; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
+IUSE_DOVECOT_COMPRESS="lz4 zstd"
+IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
+	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/icu:=
+	dev-libs/openssl:0=
+	sys-libs/zlib:=
+	virtual/libiconv
+	argon2? ( dev-libs/libsodium:= )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lua? ( ${LUA_DEPS} )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:* )
+	rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	stemmer? ( dev-libs/snowball-stemmer:= )
+	suid? ( acct-group/mail )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	unwind? ( sys-libs/libunwind:= )
+	zstd? ( app-arch/zstd:= )
+	virtual/libcrypt:=
+	"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/dovecot
+	acct-group/dovenull
+	acct-user/dovecot
+	acct-user/dovenull
+	net-mail/mailbase
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
+	"${FILESDIR}/${PN}"-socket-name-too-long.patch
+	"${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
+	"${FILESDIR}"/CVE-2022-30550.patch
+	"${FILESDIR}/${PN}"-openssl-3.patch
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108, 782631
+	#elibtoolize
+	eautoreconf
+
+	# Bug #727244
+	append-cflags -fasynchronous-unwind-tables
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no \
+	LUAPC="${ELUA}" \
+	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+	econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--disable-rpath \
+		--with-bzlib \
+		--without-libbsd \
+		--with-lzma \
+		--with-icu \
+		--with-ssl \
+		--with-zlib \
+		$( use_with argon2 sodium ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with stemmer ) \
+		$( use_with systemd ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with unwind libunwind ) \
+		$( use_with zstd ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with ldap ) \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	# bug #340791 and bug #807178
+	local -x NOVALGRIND=true
+
+	default
+	if use sieve || use managesieve; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install() {
+	default
+
+	if use suid; then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 1965c4da6e6b..b18c26e9f9ce 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,7 +1,9 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 AUX mu-1.8.13-add-cstdint-inc.patch 1158 BLAKE2B 6f8b7529c6a8b6f432303ee7aac811d66011f098a50b15817f83a397481af69045cd1558e0480be649f7781578fbbcced6c0dea1065e7b21d742041b3b29d61b SHA512 d7c2d43ceb92fbc509df0af4e0a97a993b9da15109ac7a9e7d05909d7ed2cb6e5dd8b2e2b9aadf56c1bbc83f5fb9e643db0f64daa6b1275e3be0016af8fedac1
 DIST mu-1.10.2.tar.xz 569692 BLAKE2B a75ad3d60806a5d336665b5dbc7d1f062928eff6fd2424651d3d85c4dd3134d1b4f912bd24120c14670dab49ef2e51056a0b130cc714edd0d56ab87bbdb7832b SHA512 2e8843846676c4f9ed9abb48bce8c52ffbfafcf1b7542c9f0663c2f5572c101871e935938f0406b284c6b78fb0fb190469d193151c5adbc50a10eea0edf76ccd
+DIST mu-1.10.3.tar.xz 569740 BLAKE2B bfd332d77a0c8727beeac363c35199dd8da0b4dde940981845865eda7e0ff7a7bfcbfef76509ca407bea80b4b148b0b6bce79fa928b2c4df239b55325336c049 SHA512 dbc3946b50791bb01e640d7c07a5072c4c6381b576337899c32b0f0c8331b44ab328f3887eacfff4d5ec71144164a43dc2c1241330bf00226748485027e7f21b
 DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
 EBUILD mu-1.10.2.ebuild 2120 BLAKE2B 7e459898c0d6b022af4e1aa66bd27504773f48a79c4e56ce613ce1ffd69dfd6eac069c1786aa3497470adf9bdf8b4fc532f382dd1e8e2bfe7db504a1f7cd4356 SHA512 58dc9e4ea1845802a41d7b429c89db289376152ac52140249f0e5e8f3047f342dcb8842c616b321550ea425da6fd1825507bca809ae08b61e2cd95d291d14f0d
+EBUILD mu-1.10.3.ebuild 2120 BLAKE2B 7e459898c0d6b022af4e1aa66bd27504773f48a79c4e56ce613ce1ffd69dfd6eac069c1786aa3497470adf9bdf8b4fc532f382dd1e8e2bfe7db504a1f7cd4356 SHA512 58dc9e4ea1845802a41d7b429c89db289376152ac52140249f0e5e8f3047f342dcb8842c616b321550ea425da6fd1825507bca809ae08b61e2cd95d291d14f0d
 EBUILD mu-1.8.14.ebuild 2169 BLAKE2B 01445458f171ac1bc539ca9eaf864e9b68978728dea36cdf476a790e4c19bc539d4da42480e1873ae8d3d4abc1d2c4ede618985f854edc5b4857d6a151b4e1d1 SHA512 a40006f6380b5411263189f40f1f77ca8a74a3d42d232678b118e9d1320df3d0e84301bbdffeae1378a694cf871bac8800aad7231d0e2b735e171cfddd5e56b5
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.10.3.ebuild b/net-mail/mu/mu-1.10.3.ebuild
new file mode 100644
index 000000000000..2acec2e5ddb5
--- /dev/null
+++ b/net-mail/mu/mu-1.10.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
+SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
+	>=dev-libs/xapian-1.4:=
+	emacs? ( >=app-editors/emacs-25.3:* )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	virtual/pkgconfig
+"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+	default
+
+	# Don't install NEWS.org into /usr/share/doc.
+	sed -i '/NEWS.org/,+1 d' meson.build || die
+	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
+
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
+	# Instead, put it in /usr/share/doc/${PF}.
+	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
+		# TODO: revisit this, it's not actually deprecated, just been reworked
+		-Dguile=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Since meson no longer installs NEWS.org, install it with dodoc.
+	# Also, it must be uncompressed so that it can be viewed with
+	# mu4e-info.
+	docompress -x /usr/share/doc/${PF}/NEWS.org
+	dodoc NEWS.org
+
+	# Same as above.
+	docompress -x /usr/share/doc/${PF}/mu4e-about.org
+	dodoc mu4e/mu4e-about.org
+}
+
+pkg_preinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "After upgrading from an old major version, you should"
+		elog "rebuild your mail index."
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		einfo "To use mu4e you need to configure it in your .emacs file"
+		einfo "See the manual for more information:"
+		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
+
+		elisp-site-regen
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bee549fc0533..f0c87c9419db 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index b031c86b00c3..a856a2cd8faa 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -2,5 +2,5 @@ AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c18
 DIST dropbox-cli-2022.py.xz 14288 BLAKE2B a90d347efcce5917179853afef346a6679dddbb33e146a936786c226ad519601f503d73eeb1d1e205be8bd11792aeedb90ff7046c770f079a47e75dea80efd99 SHA512 59bfbf3544a8407bbc232d87e57d8b27d4bbc108483af52e58c0badddde6ce2dfde2203403a8c5e8c95421fe8c4b73e75cec64def2699ae9bac31be965e98974
 DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294
 EBUILD dropbox-cli-2022.ebuild 720 BLAKE2B 43e752005306ef81581a0c06aa0fed4caec64e9920bee7fee98ef9f7e1d3388330526ad2dc9d76a4c9c029cc3cf23e8fd8cc9c4cf7149582aa4df8d662b4b032 SHA512 3762d2e72c0225bd8db3a0573ebd6a030099cfa2746f176fe10314b7bf22b74ad8e3646db2158326a1025cf0504bbbc3fe025bb9c1fd007b887d46d7f90d4ec2
-EBUILD dropbox-cli-2023.ebuild 722 BLAKE2B 34dbbe25e98c0a4ea453ae8185a25efaf68e1331b401e7289566be8eb11812a9d9350d0d52a0b4fd7724351582c9d4e45ae2b336497fbb534b3892c2045ccff2 SHA512 217391034593b593e300cd0eb9aa799a563f26d82ce8d88b961650d70400fd67007989889ebb3a4b81d72a6853bafb09432fcd0be37a28ca32133bc0f0185fc3
+EBUILD dropbox-cli-2023.ebuild 720 BLAKE2B 0bf4ea7ee884d532472d75482080eec1a781025baff4e9309df11ecdf3ae574a3fb06be601b9be0aefcf4f71beb13bcd8f385523ee84dde0cd0fbb0783400cb4 SHA512 313c545d7ba1de072b44296a0a474616705a965834b55ec9143b4d0c5c55f8d70ce8736af64d3202e203398c7217a3291bec36f2d4b6e1a19504aa4838d405c8
 MISC metadata.xml 311 BLAKE2B ff3b8e2e3f7b28ac858933b5cb5dda2eb2c56621c5fa07d0adc571066d598ecc97cdf114425d3c3cb5f4d49df8ce88a79b16f4f17ee462cc98ffeb9b9dba4d62 SHA512 774123d6db311ce59f6aeeb930364d3341156a0236b2606e10dac09ddb8604cb2e323c308213a39446bc8abeeaf61617162bff808cda282f441a6a8df671de4f
diff --git a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
index 44405e85739c..62034ba7f496 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2023.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gpg"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index bb1a2a412ce3..dcfcce5515a5 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1,5 @@
 DIST electrum-4.3.4.gh.tar.gz 5512701 BLAKE2B a57e3ffddacfd5c63dc7f5cb59bbfe06323e7c8ab708d49e1301356fdcc0204e8126894c3c4b6dd790bd8e64cabc84a410592ea94b361cc553d4dcaa5921f50e SHA512 dc821cbda2e95853627b141292da5a07d8a672cfaabb0b160c67b3020442416593136984b42bf021f815e22671fbded67e6d2dee95e4e46f63e5c9a8fe01ebc9
+DIST electrum-4.4.0.gh.tar.gz 5627801 BLAKE2B 27ed9fff7586f9efe18a76f3cfa6d0cc4df4d5bc542b68ce9cd78ac5d6b033114b9caea23edbbd2a531d6f877a8891a02fc321741d8ecf4eb473894f1d9c94a6 SHA512 dfa5020a2609b8faa21c1ae97e152b89cd235151c18bb2b6a0bb4b9cd5217697e3c6515d832c8f04291fb10e062c3a4d9a92c48874687ef99adfd7cf04f363f8
 EBUILD electrum-4.3.4-r1.ebuild 2896 BLAKE2B c5d42f5a55aab16022835b66633d77a156fe7c69b8ee3ee889a9609be5e824eebfafee27114776af6cfd03ac887fcb52c29f4cd44cd70faaeb58bbe33653a4c7 SHA512 11a88ece051a5107df2916717b7c0f5b08792a88d43f5d4d512ea91ad9683b01236fd9caa75d267a52888a01fccec63dffed51f1b66685749685b355dff262d3
+EBUILD electrum-4.4.0.ebuild 2898 BLAKE2B a8ef6fc4fffef8e44732cd7e3f523357738db98da2907e361644df6c5da236f8e6989d3b9f2047a65538fb045d509cadb21af22a600ae99ec23f1a8e36e4d362 SHA512 1785c57717ec7cbb733cb3585d7a7f80a9c57a0e6427416b56a20a28d672f01fda7561a8df25305c886c3ba2b0b92c42c04c7aeb079054bc23c895d1c135714a
 MISC metadata.xml 637 BLAKE2B ec4a0e57a1a11fa3a430c40b317e9a857b4128c7815fcd9fabe44adf85c47985325f4df3da9476b19f687026a145c7abf16a6a1ef6c8e25dd217732cdf77a076 SHA512 599ade68d31da44232ab7f520f0b9c054e7a26757aa7eed4f06350487d6c7c1dfc12bf2ba3dbddeb8ef8e8f0b67d093b91999cec422b3a5ea6dfadc9acf2fbc1
diff --git a/net-misc/electrum/electrum-4.4.0.ebuild b/net-misc/electrum/electrum-4.4.0.ebuild
new file mode 100644
index 000000000000..ac6a564b7be2
--- /dev/null
+++ b/net-misc/electrum/electrum-4.4.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+	https://electrum.org/
+	https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	<dev-libs/libsecp256k1-0.2
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	# remove upper bounds from deps
+	sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 4.3.4 && return
+	done
+
+	ewarn "If you are new to BitCoin, please be aware that:"
+	ewarn "1. Cryptocurrencies are volatile.  BTC has been subject to rapid"
+	ewarn "   changes of value in the past."
+	ewarn "2. Cryptocurrency ownership is determined solely by the access to"
+	ewarn "   the private key.  If the key is lost or stolen, BTC are unrevocably"
+	ewarn "   lost."
+	ewarn "3. Proof-of-work based cryptocurrencies have negative environmental"
+	ewarn "   impact.  BTC mining is consuming huge amounts of electricity."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index a07d52e555bc..467f8d43bea0 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -10,5 +10,5 @@ DIST linuxx64-23.3.0.32.tar.gz 281196971 BLAKE2B bcdf0303ba9e354e6359b3b50f2cbd7
 DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a
 DIST linuxx86-23.3.0.32.tar.gz 239477961 BLAKE2B e0d4518ea99b95e67f94fd810c70da1509fe511c5248417925034b48f77a5a9088556d57904d73930daad2960622f22851bd4e3ed3cd6c1524b5c59bab83367c SHA512 948634578fcfefa36957fba2240c0ebf6ddc4288d3308dc0234f7d816a2b20e080bf6e3a688b105b4593fc1833dd3846cce30a561c364d6ed0a9495f8f03f7b0
 EBUILD icaclient-23.2.0.10-r1.ebuild 6210 BLAKE2B 34ee22be79050c40c9bd00c85ba06dd9f7a13c6a03ed597f164fa0be42496ce74be4cb7e45282ccaabe64febae7d21d95855330f93142a3a501ee04c51f1bdeb SHA512 3ab0182bce2ce8a2e54c6501096d14cb210c05d4d3b1b3f576fa6b5824c895fb756b9acc585f11710a40aca101f791bfc80e0c4db9434b4b9b9d97d06da4d116
-EBUILD icaclient-23.3.0.32.ebuild 7204 BLAKE2B 12637ebeafba6722c1837914255398ff02f1d16bf96b555a0c0ef5cda3effee371dd4ce1eb9cb3e3e26294743c7538793e5cee2821178e31c53924af9d392863 SHA512 c6958a613a032470ba4d54583e5d637843b4322fff90838fdc5e0ffcc3acba2d6aed61daceccea5db37d3f462f3b6da0c9740314618a8cd5954b9825f4439911
+EBUILD icaclient-23.3.0.32-r1.ebuild 7197 BLAKE2B 198710d768d134ea693667429770f8ae0b958e0e6ced631400bcf27b85bf197a2fa9b27455223db0f446d9d3ca8c1c08be2e42c5cf78e6cc05a89c70de222eb5 SHA512 181053fb871447a834b00a19c57b61f3f6fd9f4441ad5d0ed0e12eb373d817c204aa84fbfeb9ee2cdd4467978b93f4ccb6e33f79ef074640e981df9d565af3a3
 MISC metadata.xml 564 BLAKE2B df856bf3af610f637dc7a12a52c92019112ec6adbd18a9762b8d0059169cf3de7d6b2377a7c3320c33b92915db83732a23104869f5e51c3e2c0e43a0cc19b436 SHA512 089cf367029e682e406034aa6d7a1b58fd656d63655fb6dd30c92b041a02fa5a093a77408c28bbaf156a3ccee9bdc2a5283908d51aab1d8494685854877aa5e6
diff --git a/net-misc/icaclient/icaclient-23.3.0.32.ebuild b/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
similarity index 99%
rename from net-misc/icaclient/icaclient-23.3.0.32.ebuild
rename to net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
index 2f09e585711e..67ffc799b202 100644
--- a/net-misc/icaclient/icaclient-23.3.0.32.ebuild
+++ b/net-misc/icaclient/icaclient-23.3.0.32-r1.ebuild
@@ -96,7 +96,7 @@ RDEPEND="
 	x11-libs/pango
 	${BDEPEND}
 	!hdx? ( !media-plugins/hdx-realtime-media-engine )
-	usb? ( sys-apps/systemd-utils )
+	usb? ( virtual/libudev )
 "
 DEPENDS=""
 
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 7a9979b77da0..d3b99a2054fd 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,7 @@
+AUX rygel-0.42.2-endless-loop.patch 724 BLAKE2B 3c77cdf65c33e296099aba6f7c2b6e7d39848995aee6a9503cdd0871e4ac373ecb4bd1609fda2b51b8457e7b7f96b24cfda169bf6faae0ef7ee504a0917788d6 SHA512 2e8eb9b9841f6d7745d3502c00ad77436d310cfe4b978398faac04fca92d3c072328c521add5c5e98d39681c34020b0d0797073227b1b18cc5673165d651ec5f
 DIST rygel-0.42.1.tar.xz 1699920 BLAKE2B 26399a996a18a04fa9a043b32209e94d1694de6da0312d0e5eb8df8ef6cb8bcb7445b31c935418a8a041e89b010f4d0f427642fdfe4063b41d5eefef87ab9247 SHA512 a4652ffad9c70b092363a82a64828b9f07a583b2045d3f953a211369eeee0cfac8e7e9bc8ae47ff6430b30d5d947b21f982e7c67cc6e24e38e77716ca55b27ca
 DIST rygel-0.42.2.tar.xz 1700356 BLAKE2B ecacf42bd9668521f0dd0c1aedb8360ff6dcb79e839487554ba07345b851966cfb04ee483224f4f6b25b0c55e01b59fb1b059d193fc9808d3a6743111ecee9d0 SHA512 ff49c723c199839d122f69dbd24452c5101ad926999f69215efb53971518fe08df65055ec8bf2c9e7d6a375e86a0b6398b2cf97f18120efea39356d7af2a4c6c
 EBUILD rygel-0.42.1.ebuild 2265 BLAKE2B cd8147c08c437103a1122880f8a54172db111edf80bf496470e4b0b54e4e090cab7ccd4711af7d21ba7e774d3df149c2e29da880257f6fe8996488c829c6d568 SHA512 b4daf39d54aa8672a2ab1609336890405bb5997f85ba2c4eb9f90d6850d48187d9448012d32c74ca65864f83b9af72b604aa3de0dcc891aa0c02139c951b1194
-EBUILD rygel-0.42.2.ebuild 2267 BLAKE2B 03f2fb06dd87040e1f7bf418abb2b89a819d67eb7041dec09f5f571db7e0d6d72e512e8c76f1c07ed56afe54d4c18a0e355b88a60c997cfeff2ee8633d2a904b SHA512 9057b16be0488806d9a4fc8118d6a2c40d535c2ea0826b20e7642ca344aceae0c29ff30ca00db0c50e57183830c788ba46b8b882c68801c94693d088f399f688
+EBUILD rygel-0.42.2-r1.ebuild 2276 BLAKE2B 85c0525da351fac7ff82442a61ad7382707212584425acb065172952a56f58050c8b1d2fa9fd1cb1e4598b033ed0e30cfbcd6f6393493780deafc6708edadfd8 SHA512 3aef1369c8f522574b09efdf4aaa32b43dec7786e609ee0fd4a515361bd8301955e2cb9f4e7dc1dbee81c717a10dab23619f76356deb9a7f8cb6eae662b624e2
+EBUILD rygel-0.42.2-r2.ebuild 2381 BLAKE2B bf873112cac8d2bea4774307aed65f24e8a76e9a479051a52082f6badd404c707eaec3c916fe8091fc6713dfeb9b312a78b191aafad119d6eb628e94899ae9db SHA512 f9db54bb3a0acd30e739842910e547a399e8eff8f9f0e7d4298acdcd4dfb40363caa84cf9f9041e955a52db9897b3aabe8f742b5e03aeba6f2525908ffb15873
 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/files/rygel-0.42.2-endless-loop.patch b/net-misc/rygel/files/rygel-0.42.2-endless-loop.patch
new file mode 100644
index 000000000000..7249115dc100
--- /dev/null
+++ b/net-misc/rygel/files/rygel-0.42.2-endless-loop.patch
@@ -0,0 +1,25 @@
+From 9be98b0c4b343abb24e6a2a598ba0084c2d65337 Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Thu, 20 Apr 2023 07:22:07 +0000
+Subject: [PATCH] core: Fix endless loop in NS lookup
+
+Fixes #228
+---
+ src/librygel-core/rygel-xml-utils.vala | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/librygel-core/rygel-xml-utils.vala b/src/librygel-core/rygel-xml-utils.vala
+index f347a271..aedf0545 100644
+--- a/src/librygel-core/rygel-xml-utils.vala
++++ b/src/librygel-core/rygel-xml-utils.vala
+@@ -40,6 +40,7 @@ public class Rygel.XMLUtils {
+             if (ns->prefix == prefix) {
+                 return ns;
+             }
++            ns = ns->next;
+         }
+ 
+         assert_not_reached ();
+-- 
+GitLab
+
diff --git a/net-misc/rygel/rygel-0.42.2.ebuild b/net-misc/rygel/rygel-0.42.2-r1.ebuild
similarity index 98%
rename from net-misc/rygel/rygel-0.42.2.ebuild
rename to net-misc/rygel/rygel-0.42.2-r1.ebuild
index 4d3ce4b56313..4bcf0dd1bbee 100644
--- a/net-misc/rygel/rygel-0.42.2.ebuild
+++ b/net-misc/rygel/rygel-0.42.2-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	>=sys-apps/util-linux-2.20
 	x11-misc/shared-mime-info
 	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	tracker? ( app-misc/tracker:3= )
+	tracker? ( app-misc/tracker:3=[vala(+)] )
 	transcode? (
 		media-libs/gst-plugins-bad:1.0
 		media-plugins/gst-plugins-twolame:1.0
diff --git a/net-misc/rygel/rygel-0.42.2-r2.ebuild b/net-misc/rygel/rygel-0.42.2-r2.ebuild
new file mode 100644
index 000000000000..a7eba617c665
--- /dev/null
+++ b/net-misc/rygel/rygel-0.42.2-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson systemd vala xdg
+
+DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
+HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
+RESTRICT="!test? ( test )"
+
+# x11-libs/libX11 from qa-vdb
+DEPEND="
+	>=net-libs/gupnp-1.5.2:1.6=[vala]
+	>=dev-libs/libgee-0.8:0.8=
+	>=net-libs/gssdp-1.5.0:1.6=[vala]
+	>=dev-libs/glib-2.62.0:2
+	>=dev-libs/libxml2-2.7:2
+	>=net-libs/gupnp-av-0.14.1:=[vala]
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=net-libs/libsoup-3:3.0
+	sqlite? (
+		>=dev-db/sqlite-3.5:3
+		dev-libs/libunistring:=
+	)
+	>=media-libs/gstreamer-1.20:1.0
+	>=media-libs/gst-plugins-base-1.20:1.0
+	media-libs/gstreamer-editing-services:1.0
+	>=media-libs/libmediaart-0.7:2.0[vala]
+	media-plugins/gst-plugins-soup:1.0
+	x11-libs/gdk-pixbuf:2
+	>=sys-apps/util-linux-2.20
+	x11-misc/shared-mime-info
+	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
+	tracker? ( app-misc/tracker:3=[vala(+)] )
+	transcode? (
+		media-libs/gst-plugins-bad:1.0
+		media-plugins/gst-plugins-twolame:1.0
+		media-plugins/gst-plugins-libav:1.0
+	)
+	gtk? ( >=x11-libs/gtk+-3.22:3 )
+
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.5
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# Maintainer only
+#   app-text/docbook-xsl-stylesheets
+#	>=dev-lang/vala-0.36
+#   dev-libs/libxslt
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/rygel/-/issues/228
+	"${FILESDIR}/${P}-endless-loop.patch"
+)
+
+src_prepare() {
+	vala_setup
+	default
+	# Disable test triggering call to gst-plugins-scanner which causes
+	# sandbox issues when plugins such as clutter are installed
+	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
+	#	-i tests/rygel-playbin-renderer-test.c || die
+
+	#default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc api-docs)
+		-Dman_pages=true
+		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
+		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
+		-Dengines=gstreamer
+		-Dexamples=false
+		$(meson_use test tests)
+		-Dgstreamer=enabled
+		$(meson_feature gtk)
+		$(meson_feature introspection)
+	)
+	meson_src_configure
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 2a0c391e5453..a3391ae6fd31 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,5 @@
 DIST s3cmd-2.2.0.tar.gz 134390 BLAKE2B d578aa13a7b8599c70dc6daa5d21950331b0b07278479d1f3947e6be78a9bd108c7f8ea6f198fa518dfa6ad44d907d979a29d5d9f1a15e4f73484fcebb118225 SHA512 07b2410554233b435b3476e09fd14354abaa19374cc1211f861147023470599483c18d213a44b5c9aee32d71b5a4bc5d9ce25721fb077cbadfd208d457e13845
 DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a
 EBUILD s3cmd-2.2.0.ebuild 674 BLAKE2B 9f9b7d82fa49a30972d1459df8e974c719072e089085f87a06aea04f18711dfd0ab11179965edea3d15e9474efbf386fa6ce06373e380d968733c4c921b194e5 SHA512 fe813bfb528da9b94cb6578da6d99ec9f9b496069ef920ff53e820ab388f317d6b72d7fbc7aea5298e4d78631645b75b6c6fba69f9988bd02d24ebf78b907f1d
-EBUILD s3cmd-2.3.0.ebuild 682 BLAKE2B c9d460ae54c47bdb7d929c89718e9f73c44da622631c3af8a27f040d73686685575f3a0802457175f607e4d4d7a979b4dcfac121b547aa6d80474a8978e6d687 SHA512 8bc52b9b7858920b1e4cd51c07ee87f89b814e250b091e2591b69194df915b02694b4d36d42f69de00f67b865f711d0e549773aa8cbd083c70b3f731b93a5331
+EBUILD s3cmd-2.3.0.ebuild 680 BLAKE2B 41049389392e606df69ed9da80d40eb24cc8346813d779c43896d7d7ed8550658674f2f75cba7e6c6bc012f1865ab480ec40e02754cfad9f362bc562a20fc072 SHA512 128f873a514aebbebe49a76d49e5144b47f1ed3345312304dcbd15a3e76f2d046a2f127fc42231678e38d7daa11e271dfc9d7b378fca8e8ab8ef4700afa327bb
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
index 83925aea1a35..8ee0e8104a82 100644
--- a/net-misc/s3cmd/s3cmd-2.3.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	|| (
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index e9ca63b6bf72..922ac7f33991 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,3 @@
 EBUILD tigervnc-xorg-module-1.13.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
-EBUILD tigervnc-xorg-module-1.13.1.ebuild 454 BLAKE2B cd908c4bdae9ab7678592577ea4236be260d7eea8688a144d7d94b5aaf054adfae90de96e6e0e435e56c0100fc91040b5edcf0cecc53edd65c36288988cc4e49 SHA512 25663ab5b2e06a6551fd2eb0a7e504e79db84ee5d8dcf5ea6b915c6b21efec1573942b50a58a8d7479e9013799b451bae17cb4900391131be0ce623d27ff4f94
+EBUILD tigervnc-xorg-module-1.13.1.ebuild 453 BLAKE2B dd75da286f0d415236277873b8b3d1b94911d337d45c84c2e3be5229bb245433ef0a9dea9ec476809808c155df77d68b34656e2859564c458f97add50cd6fce0 SHA512 1edb6cf30c6124b245b17aee834fead0a01632d130d4128d9b2a9061d9306991b74bdc3eee43c3a63c57e6fd9a4b8bd0e25f558f4908fbd8a399fc446061b7a0
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index 80bfb1fed556..836ef27cdd68 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 590b9492029c..dc496fe4aa49 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,6 +8,6 @@ DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.13.0.ebuild 5283 BLAKE2B 1e019a6ed98be9dfcbba682d9e86277a6f0a2c65ae01b40f530e487723ff353a58a9d96c86c97a6f091617c0bd1317bf4f98b8659910d4e103dd22d45d8504d1 SHA512 a2985fed7f368b90c513fe6a9f53e1317d0c6820644982c64ebced4ddd711166229794fed5a93b391c80eb6487c9584bffe01c5d69bc75d58ca6f100bced2030
-EBUILD tigervnc-1.13.1.ebuild 5285 BLAKE2B 3870c889546a94445f8fa0d4045040d05ee2a14861a668ac3ee5c4ac2d13f79e1871b766b0cb890dab28e37ac6afd4246403d81834d58456a52dd418697bd7b3 SHA512 93d41eb64f75b88fbef05b85a761c59f05b5738e29df032ce91ba261a7cb6c40842cb56f3ea914fa6ff145d15157430fdff21b3d5b3f4d5ad3116706ccd906e4
+EBUILD tigervnc-1.13.1.ebuild 5284 BLAKE2B 879d3c6c0b074b36517b47ad6ffc84bad2237aa35563bd2d5989d6bc0b52e6eaf37f08ad38e1ebb698bd3b189cd55b7a9937aa7def54e2f7ee414c7186b6c407 SHA512 b1f700906870121d4aef6f7fdf40a0db7cf1c8dd15c6a0e803fca77434dbe8913d6604ebe52d8fc2c3b5a6dc800110cb35b7759439e33288ef6e5b8af98afb22
 EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index e0b70021c964..b34d0eaaa530 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 else
 	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index c1ba0d0e661d..ed88b4b5c754 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 7f36713e5bfe..c52bb28fbd8d 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,8 +1,6 @@
 AUX liferea-1.12.9-webkit-css.patch 1760 BLAKE2B f99c7c86053a6b63a4e3d7cd3b13506870d60addab454c15c9113d5b04bba82e48b5117fc6baa2831356ea6a87ead6662c06b95aa93770c36719ff4c3dc49146 SHA512 438930eb0b23b83d996477a31014287a60b5d8e14e4828ee34ed65cda49161d9a61e85d49a396e53fd53f64f52d1dc56dfc6858113c4fb0cbad30614780d12b2
 DIST liferea-1.12.10.tar.bz2 1503040 BLAKE2B 8a935f889b972787a55f0d09c4314ee5ff4d4fa42b46af46d84e5dd5d13df95adf898dc522baadd76e7c752c9f47d771122698882142202002ebf2fa5b0e3f31 SHA512 34b9c5b9c58aaac790e44aa2495a169ea2fbc3cdf351013324615b65c083045c3b09c5d5fa6eeba994184d2d7a9e52626241877c24194f4f771af0f5b3afb067
-DIST liferea-1.12.9.tar.bz2 1496593 BLAKE2B a0887a7b04c47a69166396f06305342232b16eefba04df1a0cda7c9d84880e025d73786a55aaa528a143fccef213fa2de9474fb6fab3f301e54a12dba4a705f1 SHA512 09156e0e5e4342741b6290be17ee94a3204d431c687c17688e23067d151d36a178193f5cf01da222974810a48626c877b0cf917fbdd9ecb6e81254e85750be9b
 DIST liferea-1.14.5.tar.gz 1833641 BLAKE2B 5505e33bd113b3ea0bf7582f75aa968de2b4bbbc659f224062d735bb357177a3eec5dca26dbc22151ccb1659e740ce2068ee2933ef82eb2e3c3a96b31528e570 SHA512 866e795e31644a8546d0fd6eae2976e0c031650caf77aa87e90bc17a55f65d2c207bb295649c7b4d318fb0d628f7cae1fc0d563f59260eddfeafbe9c885f3550
 EBUILD liferea-1.12.10.ebuild 1786 BLAKE2B e9a0d536a3423de0696cee17e75f5b628abcd9e64b5fd1a7e3b8788d71abe7bba73a2e4f082e5549ee712bfd1fb7387f0c44d39a5fb81e4852950e6b0ca23447 SHA512 5d258566f54ec7c7195a8c080ed2d365f30f4e616cd9faec621d9bf2a5800448d6b8dc64baa3fbad3a48da5409e8b5c177a62f4298fe14c4d87158ecbdcc0ba7
-EBUILD liferea-1.12.9-r2.ebuild 1778 BLAKE2B 910a3fa6e897cae41c69b1fb766a94964f89a0690e60334ea6e2cc82d0814dcc7fe38c3048f3f3859cebac9df1d1f1678b66c08b65bf46b1d36c7c94f71af026 SHA512 a15b3eee4812f128cac0273e11a3f42ca95db0aa2e9d63ea11301385449250063a26512531b8212631a2d9cb14f58969f4b1a634153ec21b0486ff596bb2b7ae
 EBUILD liferea-1.14.5.ebuild 1693 BLAKE2B c39434782ba21911d8ec1c28a373d78876f28e4037fe9d7f176f61e03ddb589b5ef7cd5efc724e5b75439cbab8508e5cad38a9de5ba25dbea53842dcd9541c00 SHA512 413d717cbc8317ae70d1a288cfb291e575fcec2e785900681993bc881b7bfa560b881d0775180b1233c4dba92604c1e67ddc938f54d6dd922f934bd04a6cdd34
 MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/liferea-1.12.9-r2.ebuild b/net-news/liferea/liferea-1.12.9-r2.ebuild
deleted file mode 100644
index 5493e69a9732..000000000000
--- a/net-news/liferea/liferea-1.12.9-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools gnome2-utils optfeature python-single-r1 xdg
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	gnome-base/gsettings-desktop-schemas
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-webkit-css.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
-		Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	# Workaround crash in libwebkit2gtk-4.0.so
-	# https://bugs.gentoo.org/704594
-	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
-		default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	optfeature "Libsecret Support plugin" app-crypt/libsecret[introspection]
-	optfeature "Tray Icon (GNOME Classic) plugin" "dev-python/pycairo x11-libs/gdk-pixbuf[introspection]"
-	optfeature "Media Player plugin" media-libs/gstreamer[introspection]
-	optfeature "monitoring network status" net-misc/networkmanager
-	optfeature "Popup Notifications plugin" x11-libs/libnotify[introspection]
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d4d6a45727bf..743864850f49 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index c079096ec18e..588610a5673f 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -2,7 +2,7 @@ AUX ipsec 451 BLAKE2B deb3fff7043e04c1630119bb0cbbd6fa9b6f15666131ac9744a32d35cf
 DIST strongswan-5.9.10.tar.bz2 4765407 BLAKE2B 757d55aa0c623356c5d8bf0360df63990ec18294d06f50b6dd475273b75a883354ea8723708e4856a8f0acc4d3237ac6bcf5adc40346fded7051d78375b2bcc9 SHA512 cf1d4a79ec02ac0502494ce6bfcab7399ddff151e2bc39bd4fbb9562bae7d0c66cf8d1e387b3c36a35e4387d597889fd7519e7bce07d3a7f764b1b73bd8a4667
 DIST strongswan-5.9.8.tar.bz2 4747096 BLAKE2B 2a7e346931f909aefa17a7e2f4a2d5b491979dd21519eaffa5d14ac0e54d86207009526aed903bfadbec2d4d449a23077f391106ed9ac02851a081b563c72eb0 SHA512 16d3afc80704f896f3f97addf452b4bb29fc1911c54e980f76ac48bdbe2340ce3bd4e79024848cb7961bbe9ad5458d93389343878ca042af658d51b11219666b
 DIST strongswan-5.9.9.tar.bz2 4764675 BLAKE2B 9cbc73192527254a2d20b28295e7583a0d9ec81e4d6eb1b7d78e54b30ba8e5304a33e813145d8a47b2b4319d7b49762cd35cdbdaf1d41161d7746d68d3cef1b5 SHA512 7f5d94527193ce7716292f30db75303a0594169647e41e8c9530a7dedd914ad7fecf94885356738fd54d3781a066fa591c621d531923b20780b1fca76ad7bd46
-EBUILD strongswan-5.9.10.ebuild 9564 BLAKE2B 00c924424a97174058dd8c1416d0ae0b7615bb38abbcb09aaad9506aa72ba65d7261035229e9b00bdb19dcd2c48bb850e66f15a34102fa594af6c3b2a85dcc96 SHA512 6a9f25a9337f677bd6ae8dfb887295632f06b9d7f936813a1879d780daf1715e2d4a56e335736d058da90ebe2f77abcfcba72b64d4cdb60d0d1e9318c392e91b
+EBUILD strongswan-5.9.10.ebuild 9561 BLAKE2B 08a18210298572e077ec79caff0aab2a1df6e0f619a87d0e7eb0fdda98194254f3d09d3777a1a7000d03bf9d11f9feb885216cf2ac4a14bdd41983d8498f3ca2 SHA512 2d4241e934583e666ad5f8f8603c4b373fdc42a717c6442d2246f5f225109197339c20eee819979614bd44f22f8b628b555de9d6d49e1468a4e0f5de84733426
 EBUILD strongswan-5.9.8.ebuild 9561 BLAKE2B 21d9d8dc44c0c29285411be37eb2c5ebed05434ea83d3b96b88eb31600f2bb32c3a87fcb7c00e212b0cf6901f75ccbdc0a102ce773d017bd7c5f04c284462c2f SHA512 361dfb69148c9ff95c5826d43c574df94d8033d11e58fa80c8d89bde026a9e8198205837c077ec406f0deaa5a7356199ecca3edd9d06f993f4c8e7e5c92bb454
 EBUILD strongswan-5.9.9.ebuild 9561 BLAKE2B 08a18210298572e077ec79caff0aab2a1df6e0f619a87d0e7eb0fdda98194254f3d09d3777a1a7000d03bf9d11f9feb885216cf2ac4a14bdd41983d8498f3ca2 SHA512 2d4241e934583e666ad5f8f8603c4b373fdc42a717c6442d2246f5f225109197339c20eee819979614bd44f22f8b628b555de9d6d49e1468a4e0f5de84733426
 MISC metadata.xml 4888 BLAKE2B ffb26d9fec8ad8c5fbb68ae92a92efbf32c40b4a0a4b829d8fd287ebc80d135e3ca95ca50663acb6fc7d629570ed7f4264921a8838e2ff0a8e5dbbadb3f0fc50 SHA512 84491cbd33b325b1d960c32eafb479927d5651244fb13ee9ec8b2abddfff71f1b90b18524e044dd0cc63ccd49ef9bb0c2437ab6cf504994b8ad0a9137cd04fb4
diff --git a/net-vpn/strongswan/strongswan-5.9.10.ebuild b/net-vpn/strongswan/strongswan-5.9.10.ebuild
index 057c1e8f3e05..7737209cacb8 100644
--- a/net-vpn/strongswan/strongswan-5.9.10.ebuild
+++ b/net-vpn/strongswan/strongswan-5.9.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.strongswan.org/${P}.tar.bz2"
 
 LICENSE="GPL-2 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite systemd pam pkcs11"
 
 STRONGSWAN_PLUGINS_STD="gcm led lookip systime-fix unity vici"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 361d4f75df2d..db7d62aec140 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index bc14684cc206..6f793941eb1e 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,4 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
-AUX 0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch 5381 BLAKE2B 1dadd05cdda880f3770848e445361ec6c7d03d093d518024db776375904fcb3af31ef1f1562cbaf415d94ffff54c43551b1a5643e622f9261a2dea7402b08bed SHA512 040fde8e734c5acbf24142018942fe2bfc52e9b68235be7417c8ce82824b394df32547c3640128ac2f2787b432fc04a4a6a48184a557c3313a97eb6f75730497
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
@@ -7,9 +6,6 @@ AUX bluez-5.66-musl-max-input.patch 610 BLAKE2B dee1a911f763d590a486d3aa7bd0a3d9
 AUX bluez-5.66-power-state-adapter-property.patch 1085 BLAKE2B 9d76822b8ab649eb322e9511b86d85b912d8a073f15c563b689ad57b12e1c1eb043ed1741b62364dfae3b4a100ad4fdce36e723103f231dd77bf070c4ae0be73 SHA512 df52b4d260e0de6de9ad4bc1201740b2bc37a537c96e2a22d4f8b698caf6fcea81eba1e8d7b152ad6a1237a51e06212e7cfdc429b9b7f7ff66d23a294cbc55e5
 AUX bluez-5.66-transient-hostname-fix.patch 5163 BLAKE2B 6a0f63370634ec7bdc830d8bb26ca47f273194e4a5ebf3c7fc654371f520d117da5112e76b4939e96e0d56ede2a0663ae1414dc809b9315a8bac63045ed70867 SHA512 fe787ec5a2e77da7ca3483797b07b1c4d0dbc133d22095e8b6fb3361a79f7762284af265e3bee54e330e22b110ee95916ad1f4f1f37002af9fc7859b09d1bdd0
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.65.tar.xz 2208100 BLAKE2B 9d2937e2e14d8d8945183c6436921d9d16a6d3bcb5dbe3e2493554fbc4972bb4c006aabc793c9fb8eae47a7e9f29ae9fdf47551dfc0a238e86f5a76ce7436ae2 SHA512 c20c09a1a75053c77d73b3ce15ac7fd321eb6df5ca1646d57c6848b87c0c9957908bc17dd928da4ef2aacfc8667877cbc7511c1ba43db839bfa9bf1fb8269907
 DIST bluez-5.66.tar.xz 2257288 BLAKE2B af1911cf590461a874daa16bedb8a021a3b2c2af3254360c035d2180e0f355372651bd41da342c26e6d9631d726dd08e0d6a83a22069333b94b6fce6d546718c SHA512 ed0994932687eacf27207867366671b323671f5d5199daf36ea5eff8f254f2bc99ef989ef7df9883b35c06f2af60452be8bad0a06109428a4717cf2b247b4865
-DIST power-state-adapter-property.patch 22488 BLAKE2B a46173c0ebe4f4822c67c2f8f2f3e67dab261753f64204f1a61665c3bba1d7a10e0f8511b38ce273d986490ffd262a737bee82694909683df7386b2015301607 SHA512 b039a578454681f291dc3b04079c8d0151b13a84b4b013e290aa3c28aba1538cef2d9e9aadfe88a0dbfb8e4cea1c251cb5043f4175fb32d53526f7b82de0451a
-EBUILD bluez-5.65-r1.ebuild 9572 BLAKE2B 55f5f2c1513f1fd9740a6f953366ed39ea80fb3b8168401e0e4151b78425854cedc9b970493a1fa8622aeb429dbf40a9f6affbdc7743d36ffd0f5f49a5f1cfe2 SHA512 ec011321816418eeaa4bd43838ca8520aefdff4416ee0a7ac6baafe0c0cdacf1ec1f0bef7c8d026f03abbfa929f90f7ea2755997037d2519c6ce94329da7eada
 EBUILD bluez-5.66-r1.ebuild 9834 BLAKE2B c5994bd84c2e8c890095fe880f35862ed6ed4530ccac0e2c9a28c1652585c26d67f2bb48a416c2a395ac0d19b636e06ef3e69205688dfc43b72d70b6dde3afa9 SHA512 82e1adef5568185a948e8d8fac2d17bbe6bd95f7522bd932847755d1da64e90e02d24927c6b5116bde047c22426f0ac8277d08c9cbec77095ed55796044e8616
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.65-r1.ebuild b/net-wireless/bluez/bluez-5.65-r1.ebuild
deleted file mode 100644
index 688d93d9f93f..000000000000
--- a/net-wireless/bluez/bluez-5.65-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz
-	https://dev.gentoo.org/~pacho/${PN}/power-state-adapter-property.patch"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-# btpclient needs mesh, bug #790587
-REQUIRED_USE="
-	btpclient? ( mesh )
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	btpclient? ( >=dev-libs/ell-0.39 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.39
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	>=sys-apps/dbus-1.6:=
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	deprecated? ( !net-wireless/bluez-hcidump )
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	# https://github.com/bluez/bluez/issues/268
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# Fixed in next release
-	"${FILESDIR}"/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch
-	"${DISTDIR}"/power-state-adapter-property.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-		~BT_BNEP_PROTO_FILTER ~BT_HIDP ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC
-		~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	eautoreconf
-
-	if use cups; then
-		# Only not .am to not need to run eautoreconf only because of this
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev hid2hci) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also they can break without"
-			ewarn "previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use systemd; then
-		dosym obex.service /usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
-	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch b/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch
deleted file mode 100644
index b9b432fadff0..000000000000
--- a/net-wireless/bluez/files/0001-adapter-Reset-pending-settings-when-receiving-MGMT-e.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From ede7b915980fbc80eff80aa189c35ca016956c61 Mon Sep 17 00:00:00 2001
-From: Archie Pusaka <apusaka@chromium.org>
-Date: Tue, 23 Aug 2022 12:15:56 +0800
-Subject: [PATCH] adapter: Reset pending settings when receiving MGMT error
-
-We set the pending settings flag when sending MGMT_SETTING_*
-commands to the MGMT layer and clear them when receiving a
-successful reply, but we don't clear them when receiving an error
-reply. This might cause a setting to be stuck in pending state.
-
-Therefore, also clear the pending flag when receiving error.
-Furthermore, this patch also postpones setting the pending flag
-until we queue the MGMT command in order to avoid setting it too
-soon but we return early.
-
-This was caught during power off test, where MGMT_OP_SET_POWERED
-returns Authentication Failed because disconnection takes too long.
-Future attempts to switch power will then be ignored.
-
-< HCI Command: Disconnect (0x01|0x0006) plen 3   #17916 [hci0] 12.502908
-        Handle: 512
-        Reason: Remote Device Terminated due to Power Off (0x15)
-> HCI Event: Command Status (0x0f) plen 4        #17917 [hci0] 12.503185
-      Disconnect (0x01|0x0006) ncmd 1
-        Status: Success (0x00)
-@ MGMT Event: Command Status (0x0002) plen 3   {0x0001} [hci0] 14.519491
-      Set Powered (0x0005)
-        Status: Authentication Failed (0x05)
-= bluetoothd: Failed to set mode: Authentication Failed (0x05) 14.520042
-= bluetoothd: adapter /org/bluez/hci0 set power to 0           14.813533
-> HCI Event: Disconnect Complete (0x05) plen 4   #17918 [hci0] 16.509043
-        Status: Success (0x00)
-        Handle: 512
-        Reason: Connection Timeout (0x08)
-
-Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>
----
- src/adapter.c | 39 +++++++++++++++++++++++++++++++--------
- 1 file changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/src/adapter.c b/src/adapter.c
-index ec26aab1a..b453e86a0 100644
---- a/src/adapter.c
-+++ b/src/adapter.c
-@@ -640,14 +640,21 @@ static void new_settings_callback(uint16_t index, uint16_t length,
- 	settings_changed(adapter, settings);
- }
- 
-+struct set_mode_data {
-+	struct btd_adapter *adapter;
-+	uint32_t setting;
-+};
-+
- static void set_mode_complete(uint8_t status, uint16_t length,
- 					const void *param, void *user_data)
- {
--	struct btd_adapter *adapter = user_data;
-+	struct set_mode_data *data = user_data;
-+	struct btd_adapter *adapter = data->adapter;
- 
- 	if (status != MGMT_STATUS_SUCCESS) {
- 		btd_error(adapter->dev_id, "Failed to set mode: %s (0x%02x)",
- 						mgmt_errstr(status), status);
-+		adapter->pending_settings &= ~data->setting;
- 		return;
- 	}
- 
-@@ -677,6 +684,7 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
- {
- 	struct mgmt_mode cp;
- 	uint32_t setting = 0;
-+	struct set_mode_data *data;
- 
- 	memset(&cp, 0, sizeof(cp));
- 	cp.val = mode;
-@@ -699,15 +707,20 @@ static bool set_mode(struct btd_adapter *adapter, uint16_t opcode,
- 		break;
- 	}
- 
--	adapter->pending_settings |= setting;
--
- 	DBG("sending set mode command for index %u", adapter->dev_id);
- 
-+	data = g_new0(struct set_mode_data, 1);
-+	data->adapter = adapter;
-+	data->setting = setting;
-+
- 	if (mgmt_send(adapter->mgmt, opcode,
- 				adapter->dev_id, sizeof(cp), &cp,
--				set_mode_complete, adapter, NULL) > 0)
-+				set_mode_complete, data, g_free) > 0) {
-+		adapter->pending_settings |= setting;
- 		return true;
-+	}
- 
-+	g_free(data);
- 	btd_error(adapter->dev_id, "Failed to set mode for index %u",
- 							adapter->dev_id);
- 
-@@ -718,6 +731,7 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
- 							uint16_t timeout)
- {
- 	struct mgmt_cp_set_discoverable cp;
-+	struct set_mode_data *data;
- 
- 	memset(&cp, 0, sizeof(cp));
- 	cp.val = mode;
-@@ -734,11 +748,16 @@ static bool set_discoverable(struct btd_adapter *adapter, uint8_t mode,
- 									mode);
- 	}
- 
-+	data = g_new0(struct set_mode_data, 1);
-+	data->adapter = adapter;
-+	data->setting = 0;
-+
- 	if (mgmt_send(adapter->mgmt, MGMT_OP_SET_DISCOVERABLE,
- 				adapter->dev_id, sizeof(cp), &cp,
--				set_mode_complete, adapter, NULL) > 0)
-+				set_mode_complete, data, g_free) > 0)
- 		return true;
- 
-+	g_free(data);
- 	btd_error(adapter->dev_id, "Failed to set mode for index %u",
- 							adapter->dev_id);
- 
-@@ -2877,6 +2896,7 @@ static gboolean property_get_mode(struct btd_adapter *adapter,
- 
- struct property_set_data {
- 	struct btd_adapter *adapter;
-+	uint32_t setting;
- 	GDBusPendingPropertySet id;
- };
- 
-@@ -2901,6 +2921,8 @@ static void property_set_mode_complete(uint8_t status, uint16_t length,
- 
- 		g_dbus_pending_property_error(data->id, dbus_err,
- 							mgmt_errstr(status));
-+
-+		adapter->pending_settings &= ~data->setting;
- 		return;
- 	}
- 
-@@ -2969,8 +2991,6 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting,
- 
- 	mode = (enable == TRUE) ? 0x01 : 0x00;
- 
--	adapter->pending_settings |= setting;
--
- 	switch (setting) {
- 	case MGMT_SETTING_POWERED:
- 		opcode = MGMT_OP_SET_POWERED;
-@@ -3024,11 +3044,14 @@ static void property_set_mode(struct btd_adapter *adapter, uint32_t setting,
- 		goto failed;
- 
- 	data->adapter = adapter;
-+	data->setting = setting;
- 	data->id = id;
- 
- 	if (mgmt_send(adapter->mgmt, opcode, adapter->dev_id, len, param,
--			property_set_mode_complete, data, g_free) > 0)
-+			property_set_mode_complete, data, g_free) > 0) {
-+		adapter->pending_settings |= setting;
- 		return;
-+	}
- 
- 	g_free(data);
- 
--- 
-2.37.2
-
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index b3b474e51d68..4c968cb2c7c6 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,6 +5,6 @@ AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69ac
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
 EBUILD kismet-2022.08.1-r1.ebuild 5886 BLAKE2B e057c33c4653a2ced2d33b9371e5a33f79ac356139988b72687657431d467042615b31bf7586798e4c048b5cece0dd5cf80fbe51afe91e66074f8d94e6e54508 SHA512 625c2aebf4179f37d5f053ccd153b11bdcfcb0cd8fdeab92506b695c3cda503e6683a5937a2e4d4f689a2a257fd023b24726f2f1dcd425d6d8563f53a35f7e84
-EBUILD kismet-2022.08.1-r2.ebuild 6017 BLAKE2B 0ac8e1b51ab4e5653cc3387ff145b92cde32dabd1f4f0a5c718b6da2fa7fc802969c4e4c9ebba49c02b565f2ce4bdf8ff09b5636fbefe27428ea221eb15ffd95 SHA512 b2416de82b6cbf4ef913ed64629500f483f26ea66520db9b5a89f842bda75311b471761275ebc927b9c308bca29fdb9065e242743d7a803a227befb3844242ef
+EBUILD kismet-2022.08.1-r2.ebuild 6014 BLAKE2B f46ea8ed5c5e6761cde9a469ce8a0c94f1dadd1dd1b8cca8702ef31a2b77edaf0f18a40a3aba16fb0ed45c2d25df4e7c53e86caf202d00e16cc3b112543dc028 SHA512 2cdd1766022a2b4f8809ac1bd8622927d2188503dfaf1955d68eaa1e167ffe5a0905774f57f08836a82f63850fd5196a2e9701c406e93dd58908549fe8cfa9e8
 EBUILD kismet-9999.ebuild 5746 BLAKE2B 0c63cade94abe5f3dad7aae2d88d29fd3e82098c8e04355fb303dd060bb6ee6f7037f037cbafa488e6e286b63d324911b8b115858fbba8782b1746109379a942 SHA512 010c6470cf8aead53cd46a47d22691eee0c9197c4b26827873c2ca58b2ff033d1ccd50f0a10160e50f467f9a584b09a66d028bf71fb4256b997d08db62813c84
 MISC metadata.xml 873 BLAKE2B f4dea6914ce2380db76b7f66d3028dbc22a5785e41814b71f3876716148e71e82f9a62035d27abeba1567222b16da560e7e74a6ca2379433bf68b5a842fa618d SHA512 a82c3f86ab863646e6d7c8a91b033c851413487652621e576c7baf9b956ff39b8b4c4d8616478eb62752766aa8b10039d1c881cf29c99ea44eb98174c3cf4f67
diff --git a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
index fe8f8bc10d3c..934221430f72 100644
--- a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
+++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
@@ -25,7 +25,7 @@ else
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index c94e1b4e5b28..7b9e33d0d562 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -2,6 +2,6 @@ AUX lorcon-2020.06.06_p20220216-C99-decls.patch 512 BLAKE2B d6dd05e1ea653cc217be
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 DIST lorcon-2020.06.06_p20220216.tar.gz 506368 BLAKE2B 2881af0130f331b2f648c0d29b0d70516770b833ba18b5f9bf6d4eb9eaab2192034ecc840f5e2b323c0e0fb8737dd1e29525b237d95825d60e78e3200f4ac929 SHA512 3f7d5967a1af840f8f6f05872c06d908ce426e7827046b8d86267770da044b48973554ff7a0415756522332055496f00ad078fa6a25a1898d640c925834111ef
 EBUILD lorcon-0.0_p20200214.ebuild 1499 BLAKE2B 637707b9e019c511e79ca6efd72bc7a0d53f8e6ac90aa107fd520bab1c8bd77b8cbb080ce1a34342cd2786e613950c52fe3ae83dafb4ff048d3cf169bebae98f SHA512 7a2a60d8fbf3735371581b01b31210970ca94ae06bf3469715224a3797436c20d4163c129d15880b98242d12c64e71264ec7979c9d79c4caadc35b3a41ae3f67
-EBUILD lorcon-2020.06.06_p20220216-r2.ebuild 1451 BLAKE2B 8bb3cd6631df9cdac745ed14040b0d5f0187e8896071560ddfe8a365ea09a011feb34b839ef1e849d8c7e00ea68167194be4abdeda1f1a9e0f4f21830c09cc79 SHA512 31177cda443a9b59255bdd04e8ae8c90819624c5713b55aa32112855ab781d79463ab81efd6f6d51009a0fb05d370ad51e862d9273536ee0b100d5ce5fde467f
+EBUILD lorcon-2020.06.06_p20220216-r2.ebuild 1447 BLAKE2B f3f73d6a6f93dcf2e86c169861baef182c22d6cc4e6b1ada9a23386fbf231fbad30dc87046356eedcffcd9124815d35c58614db66547632fa6d9fdeeeca7347e SHA512 39d4e314db74d404bf0aeda40c434e857c61452cc30a809a2755205dd232daad2e2b0abdc000fd78b474ccb2d00e36c785a01e9c6429cd1cadb997e21d641bc0
 EBUILD lorcon-9999.ebuild 1403 BLAKE2B d1567b69b9c970e0c2fad6b6f0dedad42ca60c5d27d042791c29a1a1bd514d8c3087f909504cd6f1c480c16cf103642534ae33b92782e9cf69b650c2f7185d15 SHA512 3f5f0a656a8911a0787abb5ccc96da2b63f2baa350e240f6421c585b4870aaf723ce8f71bf1e00bb7eb941bc7f66b8cf47cb4872a50bfbbeb63dc43864130c71
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
index 19a7dbbdd451..c683b59bc137 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06_p20220216-r2.ebuild
@@ -23,7 +23,7 @@ else
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d96c090b3425..7adb2dda9476 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index cad66f2225e8..f84e98af6405 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -68,12 +68,6 @@ dev-cpp/eigen test
 # app-misc/tracker fails tests on loong.
 app-cdr/brasero tracker
 
-# WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
-# dev-libs/libcdio fails to build on loong for now.
-gnome-base/gvfs cdda
-media-video/ffmpeg cdio
-media-video/mpv cdda
-
 # WANG Xuerui <xen0n@gentoo.org> (2022-12-05)
 # Respective dependency fails to build, pending investigation, mask for the
 # time being
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 7bf782958084..aa2c609f9148 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -1,6 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Pacho Ramos <pacho@gentoo.org> (2022-04-19)
+# Default to lua 5.4 (upstream requires 5.3 or higher)
+>=app-text/xournalpp-1.1.3-r1 lua_single_target_lua5-4
+
 # Haelwenn (lanodan) Monnier <contact@hacktivis.me> (2022-08-07)
 # Default to lua 5.4 (upstream requires 5.2 or higher)
 >=app-editors/vis-0.7-r1 lua_single_target_lua5-4
diff --git a/profiles/package.mask b/profiles/package.mask
index 58ec752805be..223e2a7337b5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,33 @@
 
 #--- END OF EXAMPLES ---
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2023-04-21)
+# Unused java libraries. Removal on 2023-05-22
+dev-java/avalon-framework
+dev-java/avalon-logkit
+java-virtuals/servlet-api
+dev-java/resin-servlet-api
+
+# Ionen Wolkens <ionen@gentoo.org> (2023-04-19)
+# Snapshot matching Proton-8.0-1's vkd3d-proton commit, but reported
+# to be semi-broken. Keeping around anyway but leaving masked until
+# a proper release. Bug #904660.
+=app-emulation/vkd3d-proton-2.8_p20230207
+
+# Sam James <sam@gentoo.org> (2023-04-19)
+# Last-minute libstdc++ symbol versioning magic causes e.g. mold, cmake
+# to segfault:
+# - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108969
+# - https://bugzilla.redhat.com/show_bug.cgi?id=2187768#c4
+# 13.0.1_pre20230419 was GCC 13.1 RC1. RC2 will be made when this is fixed.
+=sys-devel/gcc-13.0.1_pre20230419
+
+# Michał Górny <mgorny@gentoo.org> (2023-04-18)
+# Breaks ABI without SOVERSION bump, effectively preventing
+# xfce4-terminal from starting.
+# https://bugs.gentoo.org/904500
+=xfce-base/libxfce4ui-4.19.0
+
 # Sam James <sam@gentoo.org> (2023-04-18)
 # Fails to compile with GCC 13, out of date, QA issues, and various open bugs.
 # Removal on 2023-05-18.
@@ -71,6 +98,7 @@ net-im/cawbird
 # See issues reported at bottom of bug #904247 and bug #904263.
 =sys-libs/ncurses-6.4_p20230408
 =sys-libs/ncurses-6.4_p20230415
+=sys-libs/ncurses-6.4_p20230418
 
 # Michał Górny <mgorny@gentoo.org> (2023-04-13)
 # Lack of support for Python 3.11.  The current version is from 2016.
diff --git a/profiles/updates/2Q-2023 b/profiles/updates/2Q-2023
index 8a8d1d9e923e..c8c8a880e73d 100644
--- a/profiles/updates/2Q-2023
+++ b/profiles/updates/2Q-2023
@@ -1,3 +1,5 @@
 move dev-python/jupyter_core dev-python/jupyter-core
 move dev-python/mkdocs_pymdownx_material_extras dev-python/mkdocs-pymdownx-material-extras
 move dev-python/jupyter_client dev-python/jupyter-client
+move dev-python/importlib_resources dev-python/importlib-resources
+move dev-python/importlib_metadata dev-python/importlib-metadata
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7c3be1347fe2..16deb12d57ef 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1626,10 +1626,7 @@ dev-java/ant:resolver - Enable Apache Resolver Ant tasks
 dev-java/ant:swing - Enable Swing Ant tasks
 dev-java/ant:testutil - Enable optional test util classes
 dev-java/ant:xz - Enable XZ Ant tasks
-dev-java/commons-logging:avalon-framework - Add optional support for avalon-framework
-dev-java/commons-logging:avalon-logkit - Add optional support for avalon-logkit
 dev-java/commons-logging:log4j - Add optional support for log4j
-dev-java/commons-logging:servletapi - Add optional support for servletapi
 dev-java/dom4j:jaxen - Includes org.jaxen.dom4j package
 dev-java/eclipse-ecj:ant - Support using ecj in Ant builds via dev-java/ant-eclipse-ecj
 dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
@@ -2370,6 +2367,7 @@ dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
 dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
 dev-python/pandas:full-support - Pull all packages to give pandas full support
 dev-python/paramiko:server - Enable server feature
+dev-python/peewee:native-extensions - Compiles native C extension for more complete SQLite3 support.
 dev-python/pillow:imagequant - Build with Image Quantization Library support
 dev-python/pivy:quarter - Use media-libs/quarter for GUI bindings
 dev-python/pivy:soqt - Use media-libs/SoQt for GUI bindings
@@ -3607,6 +3605,8 @@ kde-plasma/plasma-meta:wallpapers - Install wallpapers for the Plasma Workspace
 kde-plasma/plasma-nm:modemmanager - Enable support for mobile broadband devices
 kde-plasma/plasma-nm:openconnect - Build support for the OpenConnect VPN client
 kde-plasma/plasma-nm:teamd - Enable Teamd control support
+kde-plasma/plasma-welcome:discover - Pull in resources management GUI; a centralised GHNS alternative and optional sys-apps/fwupd frontend
+kde-plasma/plasma-welcome:kaccounts - Build the OpenDesktop integration plugin
 kde-plasma/plasma-workspace:appstream - Enable AppStream software metadata support
 kde-plasma/plasma-workspace:geolocation - Enables dataengine providing location information
 kde-plasma/plasma-workspace:policykit - Enable locale generation and Users KCM using sys-auth/polkit and sys-apps/accountsservice
@@ -8434,6 +8434,7 @@ sys-libs/ncurses-compat:tinfo - Build curses library (libncurses) sep from the l
 sys-libs/newlib:nano - Build additional newlib-nano library
 sys-libs/pam:berkdb - Build the pam_userdb module, that allows to authenticate users against a Berkeley DB file. Please note that enabling this USE flag will create a PAM module that links to the Berkeley DB (as provided by sys-libs/db) installed in /usr/lib and will thus not work for boot-critical services authentication.
 sys-libs/readline:utils - Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline
+sys-libs/snapd-glib:qml - Build the QML bindings
 sys-libs/talloc:compat - Enable extra compatibility stuff
 sys-libs/timezone-data:leaps-timezone - Install the set of "right" timezones; these timezones include leap seconds when counting seconds since the epoch (while POSIX does not) as they are based on the TAI (International Atomic Time) clock
 sys-libs/timezone-data:zic-slim - Default to 'slim' file format for /usr/share/zoneinfo. Otherwise 'fat' format is used. Not all programs can handle 'slim' format'.
@@ -8498,7 +8499,9 @@ sys-power/nvclock:nvcontrol - Add NVCONTROL support for OpenGL options
 sys-power/suspend:crypt - Allows suspend and resume from encrypted disk
 sys-process/atop:modules - Build netatop kernel module and install netatopd daemon.
 sys-process/audit:gssapi - Enable GSSAPI support
-sys-process/bottom:battery - Include support for laptop battery information.
+sys-process/bottom:battery - Include support for laptop battery information
+sys-process/bottom:gpu - Include support for GPU temperature and memory usage information
+sys-process/bottom:zfs - Include support for ZFS ARC memory usage information
 sys-process/criu:bpf - Add support for BPF programs via dev-libs/libbpf
 sys-process/criu:nftables - Add support for net-firewall/nftables
 sys-process/criu:setproctitle - Use dev-libs/libbsd to make process titles of service workers to be more verbose
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index fdb91e99a5ef..653720e5d41d 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index c1fa1ead5599..3c2e0b2db476 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,5 +1,9 @@
 DIST chemex-2022.3.0.tar.gz 2842921 BLAKE2B d0fe809ed64ee86ef319bd76c33dea1e75de13fc7cdf7e77d8cb74e4c76b66edd6e3c535df405a66bfc228780f34ee18a56639241ae8c234ac4128ed4ba806f3 SHA512 93a8e362ec024a3d49e2792e485b3a7808944fb02c41dae0d0b2af14ccb00b95d9edddc47eef0f08d1040b08cf6078be74b45185be84b495ead96c951ee52515
 DIST chemex-2022.3.1.tar.gz 2845188 BLAKE2B dbc6c73f1c8702a027c647b6c9a64a00a0ba5ce64edddd16fc68062b3bc4cff95f4c643d57b28d74f3bcda7b24ab99ce9bc28baad950b9cca1356e6b8a36be17 SHA512 f398a3402e11157950b599325c2152a2b47221cb2b926510fd4494554399aaf404de871c83f23fff86be8124e1151903cb6378c118fdecec55f4110cdbf74647
+DIST chemex-2022.3.3.tar.gz 2845363 BLAKE2B 66912797480ceab3c4010c6c90f26e3cbb134d9b0f06fee35f46e22571ddd6cd30f2a65097d883ced7a2617c4034e5ac19caf76213f188465c791152087d3a32 SHA512 62023b86eb8c61365e09deeacd4c5e50c62897a814d7cfc99ec9fb3bb6a152f70fa387b4ea541eb7e3093149168811b1e9dd9177df9d893f612190b006c335dc
+DIST chemex-2022.3.4.tar.gz 2845201 BLAKE2B 91a76bdb54857710d482b14e36d24adec8706c385da7300d8cf7189426af28651877d487eb061e26656432575eb711de0e3a92724d1488d99efcdc8a682b59bd SHA512 304af730149a2f6723bbe36c0deafb826392cd571a2b4245bb42e28612ceef3ee2ca989f1909ddc7709081f742a997469565ef7d02994fda8087372f29e1dfe1
 EBUILD chemex-2022.3.0.ebuild 1251 BLAKE2B ca114ddd2d001cc8483f03bbf6e360d4e6f9c43c3fc013728a8691b4e220f81bbcda5ea7285502b7def50c8e2adcb57a10a536e27901b0da78d93f0e22eee1e7 SHA512 14dbbfd46838fb85a476328648c7eb5ef02909279f65f88ba8c4169991c0fdc6c84bafe526aac2f1046dcf4701fc34853573e1c0c8d041738852976326bc4731
 EBUILD chemex-2022.3.1.ebuild 1251 BLAKE2B 5ead04345849a34fabfed3f675d5b0112853725206c208582ac55e0f3445a6cb32b449984da0c77f3aa466d8f5fcf70126c876e44bb9d5af71fb27beb8915438 SHA512 a088244bb017102b627b0dc8dc8a511a8cd2d8e26ecaf8b1b4358e707876c4bb927908844c57b132c99cacf6aa0c16a1982502883dd2bda63066d6f6bd600a9a
+EBUILD chemex-2022.3.3.ebuild 1250 BLAKE2B e6af845a61c59bc318e985d4e0b335aa526d426ff5186d07455768d2cf03e2ae6cdfd128fad40da16d33c13aba6dee6bf52f18e9eaeca9d2ddf8288312f3366a SHA512 b19b3336e0ac78b877463bc2431fb1daa57d5070444785ca47691cf21174b27277b3c41b49b136c18893a89015caab111edbb65b6a3dd1c90310f96388a85fdd
+EBUILD chemex-2022.3.4.ebuild 1250 BLAKE2B e6af845a61c59bc318e985d4e0b335aa526d426ff5186d07455768d2cf03e2ae6cdfd128fad40da16d33c13aba6dee6bf52f18e9eaeca9d2ddf8288312f3366a SHA512 b19b3336e0ac78b877463bc2431fb1daa57d5070444785ca47691cf21174b27277b3c41b49b136c18893a89015caab111edbb65b6a3dd1c90310f96388a85fdd
 MISC metadata.xml 300 BLAKE2B a1ad769918094ddbda13ac92462ec69fa469dfcacde1202c653a4aa7443db661ffa5739cd039b6e38b13f0345a2680f276b4e071362106b162c95cd92007b5a8 SHA512 755c273f6bf67f79c388d06d970702a1d4a9f84338f8d889dd9146905c6994621917952225406ffba5bfe1e1b69f0bfd0f471374178b15343f4927af9de49aef
diff --git a/sci-chemistry/chemex/chemex-2022.3.3.ebuild b/sci-chemistry/chemex/chemex-2022.3.3.ebuild
new file mode 100644
index 000000000000..3df32b1ac247
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2022.3.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="yes"
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-5.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.7.1[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.24.2[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.7[${PYTHON_USEDEP}]
+		>=dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/rich-13.3.4[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.10.1[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-chemistry/chemex/chemex-2022.3.4.ebuild b/sci-chemistry/chemex/chemex-2022.3.4.ebuild
new file mode 100644
index 000000000000..3df32b1ac247
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-2022.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL="yes"
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/ChemEx/archive/refs/tags/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ChemEx-${PV/_p/-dev}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+
+#RESTRICT="!test? ( test )"
+# FIXME: Restrict until tests are readded https://github.com/gbouvignies/ChemEx/issues/51
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/asteval-0.9.25[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-5.3.0[${PYTHON_USEDEP}]
+		>=dev-python/lmfit-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/matplotlib-3.7.1[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.24.2[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.7[${PYTHON_USEDEP}]
+		>=dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/rich-13.3.4[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.10.1[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
diff --git a/sci-chemistry/dssp/Manifest b/sci-chemistry/dssp/Manifest
index c3e72ea4b5f8..1c9cd5664d45 100644
--- a/sci-chemistry/dssp/Manifest
+++ b/sci-chemistry/dssp/Manifest
@@ -3,10 +3,8 @@ AUX dssp-2.1.0-gentoo.patch 1513 BLAKE2B aabdcfff1083d7552392c35897eb8a84b07323c
 AUX dssp-2.2.1-boost-1.65-tr1-removal.patch 2126 BLAKE2B dc59d21a6be26ee96b636c13645163478999d5122f09d3a72963843be773210ea225e374941bd057ef6f083a13fb77980bd4390174df2a0c715f0386da7232e0 SHA512 8f84c6e163888d6a8192683a6555f7d6003634854f5cde0f6f962744e531165c7e0b2b08c55cbfb9c396d167c44317dd2e7a8290e4defd2c8def0a6511fbbd6c
 DIST dssp-2.2.1.tgz 47141 BLAKE2B 34d8b2db8797a8c23763766c0214337f03584c4be52c1bc820a0df0db6a5f78ac0229aafdd47a60b8fd6f4832abf0399663c53f9e898c75f08ecbe22b141c8da SHA512 4a273714d6b3230daea166caa7f4117d5ccb225bea0cf1bc2eb61539b6cc8e227d0ba19047d61f0ad0d1d6bc2efdec9c193bd44341e15ef0950acb4a22498811
 DIST dssp-3.0.11.tar.gz 168085 BLAKE2B e1c42fd22cfb2287f10b5deae48b56a4583d4a67737a3485dcbd160d1597a15c2d5105c3794c875d8001abede1c014efb4f7f5b7c250f867bdf9ed95a0860217 SHA512 a0cfe44e517ff1f909ef2928b62ae2c639c6bddfd8a0fb538883f647fd2771e00da68e0fd2521aa02ba3c6d1b0c9b784b7fe142392af3a3abf6ea89f1546bd9d
-DIST dssp-4.2.0.tar.gz 157104 BLAKE2B 4caffb5f7cfe2a130e3ac6c5efa41689bbbb8ee054333cd4320cf77ac36dccaa128fe816ca57b6bd287271924122de4252076628098db415c854df6f09c17ac2 SHA512 b86c736ea9fdf62be923f8a69bae56f7298cd01e6623c1f3eee6951e20483d24438b1318924e980b6a98b19c77cb84d4ba66260a575b63e7c536ecba0478c4a5
 DIST dssp-4.2.2.1.tar.gz 144413 BLAKE2B 97c587bc0b4ef3d212ae81d568f817aab54f1dd2a77d170746e9b0d3f1bd63873d21fb0a7fc38c0300fc091f21241820d5d009d42a9e3e33dcc608c046185d9f SHA512 6daa41aea766940bf40afaee068daef341a7f79cae79d967b8da00e7002bdb602deaed40e452a5f0cea9aa2041a5c8678dfcae2e0f595cc5a0856392162dcdff
 EBUILD dssp-2.2.1-r3.ebuild 869 BLAKE2B a0941bcc1b057c0a8fc8aede77313cd79d9a81ac2ac23fb3cd3c0b79dbd13d028fa24ad83227fb8b582e63cc4a62ceaddebf2db710757d5fa4cfee83ca5438cf SHA512 84e21152a4de933ebe82a5cdf7bf66992f871ab2e4d8c3de974fae066e191c595a4de43680cbdd81265c6b638353d7d858d117f5c532894a1da7fac6e6018a43
 EBUILD dssp-3.0.11.ebuild 874 BLAKE2B fb962065caca88ba6eb8eb8aec44c870b5d6a66fa068bf1f48e328202a1ad2deef717d6163bff8839b25545edfe5241fb4a69ea5bce73ff349f16e9959fd4ade SHA512 823ef9d37cf8793d9151770b831afa5f221906b3dfa57aa07aba8ddb19d6c95e00f88c9043c04efcfff1cbbad14931205d625523311da43ba5dc8eeecd4dc144
-EBUILD dssp-4.2.0.ebuild 788 BLAKE2B 1da219b5ac583520fb188cee6f9e75728c2408d8850a1f4b0ab3c9623e17a7376f2630e97ae06b450596b2d671b7d7bfdd341d9b9f1ac75f70fc1a911b6e1361 SHA512 ce2a4c2439a9b5a7368a2198b7531c1ce79e464f98bb388d85a134a29e8309faf6eff3c8985af706817cefd287c70832d501c57f238ca18109285d5dd4650277
 EBUILD dssp-4.2.2.1.ebuild 788 BLAKE2B a5db07b22d8d27e6c3ada69a8cb7764a9ff0d9acbbb0bb308d6bc4713e08ea427b10179ec24ed8b02c5766ede5c9061b9620e3f2d6e6fe7ff491780c66eee3c9 SHA512 829f9775b9a11d09305a28c4ce8bc1cb050b2155a5ca10c5abb24e0831cd62d3005623eac95f8018dac8e3e182f21716ac5e89cc0b797a0e574e6d5721fcd0ef
 MISC metadata.xml 295 BLAKE2B 4355bbe00822cc702acdf70031ab9cd1f2a8f6e076d71016c1783f2a6c052c2da0a1a4a1860062562bb837161787f2481fa6f49c4319c546482a263ebe149bb0 SHA512 ace35ca21c614a7c0cbdea2496be3190a907295053566707c1875836a306cc9e9c96816cca6ce2b514935f6fcd494d2e813f4d94ba88552cd7b86831f30501f4
diff --git a/sci-chemistry/dssp/dssp-4.2.0.ebuild b/sci-chemistry/dssp/dssp-4.2.0.ebuild
deleted file mode 100644
index 3aa043cf45af..000000000000
--- a/sci-chemistry/dssp/dssp-4.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="The protein secondary structure standard"
-HOMEPAGE="https://swift.cmbi.umcn.nl/gv/dssp/ https://github.com/PDB-REDO/dssp"
-SRC_URI="https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/boost:=[zlib]
-	>=dev-libs/libmcfp-1.2.2
-	>=sci-libs/libcifpp-5.0.4
-"
-DEPEND=""
-RDEPEND="${BDEPEND}"
-
-pkg_postinst() {
-	if has_version "<=sci-chemistry/gromacs-2022"; then
-		ewarn "DSSP > 3.0.x is not compatible with gmx do_dssp:"
-		ewarn "https://gitlab.com/gromacs/gromacs/-/issues/4129"
-		ewarn
-		ewarn "Feel free to mask newer versions if needed."
-	fi
-}
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 4d1dc7a56a75..6794f5478a93 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/NanoVNA-QT/Manifest b/sci-electronics/NanoVNA-QT/Manifest
index 16ec2949c5d6..a31b921a3b79 100644
--- a/sci-electronics/NanoVNA-QT/Manifest
+++ b/sci-electronics/NanoVNA-QT/Manifest
@@ -1,4 +1,4 @@
-AUX NanoVNA-QT-20200507-missing_headers.patch 513 BLAKE2B 541d4a6e9ca4db5735c96c73bc8999c57db892cf808025917e8e7670b864a10477092cfe64f790998e08d3d778e4159d81f36b9d7c78cb46cfec787ca4fb9b81 SHA512 1c756605fb1f813862d32823ad085b7a9642771c9870eaca54e22375b11ff1129a4a9a1f5c93eeddfc5d3acbc2eca332dbe3306c234e86fb1fd99477f81ad921
+AUX NanoVNA-QT-20200507-missing_headers.patch 896 BLAKE2B 75997eee8ac12a8365bc0562098cb1b5224d78653f7e452ff961a5c98be3498762086ccd0e70e410896eae81e486f0f09f05ab7624b6192e4e1358d5fe6cbbd2 SHA512 36a52c0c9822ff983e56f54033713bf2748b4b208f04a20bf5fee21bee4f9ea406d32fb042fadc2a362791089cf19d4b67afe6ad86e3b38b71aeb7bcde929722
 DIST NanoVNA-QT-20200507.tar.gz 876476 BLAKE2B bda4424b0dfb8b977a3e4227393d477f7c6d6518b34887fb4104deb805768f1466d3a01f4b5949c80c0177151b6660158296a1eff24f6f6614ee53e185e2df38 SHA512 7b465c06cdff8cdc9c13ab4e6d6c4502849a2ef42e81de3f3d47bcf49008761307ea57e6572d316a96993aa547ce7f8185bab742d11139e313c33161d2324a21
 EBUILD NanoVNA-QT-20200507.ebuild 1416 BLAKE2B fcf58a1acef4b868407432fb8bee111d38078052e8cb7012957e476355c1f600700d304b40c5ec021a2a191fdaa3b083fd46186b66b2c08d3002ccf2327ca146 SHA512 5a1bb9c1ca297a78b0f3a58b608f1120e785265c6aabf5466f8afc5bf35a2b8dc938a5b98146c2ccf081e0f663e61ec3c664429f938db87f8be2be55c9bb996b
 MISC metadata.xml 332 BLAKE2B 0df01b9398bb0f96090d0742dba0320ff3e389ee4b795ce19f39924146b91408bcfe04ea38287228879785df135b51b8d0ebf7c56b8a99def323c59c85228829 SHA512 42897e30597f019edfb1c444e56e4f7226e0acd481aef7ac9e96a6e5f777bb849b31458b598c53a1556c5f48f7d12dab8da8069cfede5178f40698ccbec48926
diff --git a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
index cebe3c5239fa..d49cef3f53c6 100644
--- a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
+++ b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
@@ -8,6 +8,16 @@
  using namespace std;
  typedef function<void(string dut_name, double cableLen1, double cableLen2)> xavna_ui_changed_cb;
  
+--- a/vna_qt/firmwareupdater.H
++++ b/vna_qt/firmwareupdater.H
+@@ -2,6 +2,7 @@
+ #define FIRMWAREUPDATER_H
+ #include <string>
+ #include <functional>
++#include <cstdint>
+ #include <pthread.h>
+ using namespace std;
+ 
 --- a/vna_qt/polarview.C
 +++ b/vna_qt/polarview.C
 @@ -3,6 +3,7 @@
@@ -18,3 +28,13 @@
  PolarView::PolarView(QWidget *parent) : QWidget(parent)
  {
  
+--- a/vna_qt/polarview.H
++++ b/vna_qt/polarview.H
+@@ -5,6 +5,7 @@
+ #include <QImage>
+ #include <vector>
+ #include <complex>
++#include <cstdint>
+ using namespace std;
+ 
+ 
diff --git a/sci-electronics/kicad-footprints/Manifest b/sci-electronics/kicad-footprints/Manifest
index 4a9bca34ae94..1eebbd6d6f0e 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1,6 +1,10 @@
+DIST kicad-footprints-6.0.11.tar.bz2 23763091 BLAKE2B 8a4478a4dbdedef9d3f1f658b09065746e48d4e6f5ecfc89aacb0d53a0bb33a71b16ba6742062f6629b14e0b788485fb876076b82c576c8a72ef7bcc19fc74be SHA512 f30a7443bab7edb7943759d6b938be05b0fbc23d2c7c95f4b9e983c31295062dc1885cea076b5e06de2d1aa766b732471f34ae78c5f682cff1c024937acf8363
 DIST kicad-footprints-6.0.9.tar.gz 31723499 BLAKE2B 33856d28a52f8f516c96c38c68aabe3d57c3f7eade5cb654cd0dca15f36263b9860f252468edf0b94f228c2497ef7e862cebfd023e2a166ce1696a89c1cff1e1 SHA512 43436a61fb1be66dc6cd6079e49e7af0f7d374f074874fd008eb45c2b3faee596e102173a274064a536f11c4525f223c9e8c2a33969811414811a226e69affaa
 DIST kicad-footprints-7.0.0.tar.bz2 23928107 BLAKE2B 4f4a03b47f208ab431a41e6c20348e7d227a1dc6c24657308ff76cd800923993c2f937dbc737f5bdaa17703b6d1e435eac7b344a8f6462c500917ecffd4195a3 SHA512 fd6d7436838499a8ee1ed36ec23f1c7f85519e7f9641cb0a85556203dd51e7855e549d0cb1afe91c4a4885b62f87d4c765407d366728e6a6fbd64e75ac0ceb89
+DIST kicad-footprints-7.0.1.tar.bz2 23942389 BLAKE2B 06408aaf1a388287dc0929f8f99e70bcab62051da1a4674f48ea264a75fd5780fe355420dafe96fd8548679c508a3860bdc0ba8ef287a3c7b3c6c78c0fdc2975 SHA512 1bc7ffdf089414c40e74a2b8c155e83900d406f46036d0803f115e505e25f7071111acc5bc85456de4c96af26d8a13ca81bd28dca5dfe48e26e5944f4478a688
+EBUILD kicad-footprints-6.0.11.ebuild 872 BLAKE2B 5e7fb1db34e9d175f4a65d9eb0737b3f047f899d57039a496ea74824548db3e9d5d151a8da0e073ada6327d58050fc6ac287a25b52f12bca496b754065c11b91 SHA512 83e985b57f992224462e16a28ce416b995688ff5dc2639324c18b9c19455455194fc162790cdd95ae962a1ced27f97f0385057679f972f51bf2247a08abf3d83
 EBUILD kicad-footprints-6.0.9.ebuild 869 BLAKE2B b38552d1da1fc4ac3610bc7dab4160a5db10032a57e27da835f8233ddf3538a6d6178cc27bf68f3992fe191f061adbb4ff39bec2c5b04adaad4817dfc508fb6e SHA512 0f95329d50c41c6b58ff620a9c95c7ef8603e5150e22195a9139479cc84cd8122d5ffb3e15347b495370bba03e74b00f10b3ba16435b82b79ff314d03ece244e
 EBUILD kicad-footprints-7.0.0.ebuild 735 BLAKE2B 9e9d0baf11b94f0d40fe503e471f3c78c5073e716cebfbddbaf0fc4e4d94384baed813316bafca6438190acc378b211f1ac5f796c964dc655a35163cec9f1e85 SHA512 35982599de717abcbb5a70007b1d3073c18dc217ede180bf6331f04386eb378af5751ab3d934da353ac27d77b824b20bb918226155da9d3d3b599b309b28bbe6
+EBUILD kicad-footprints-7.0.1.ebuild 735 BLAKE2B 9e9d0baf11b94f0d40fe503e471f3c78c5073e716cebfbddbaf0fc4e4d94384baed813316bafca6438190acc378b211f1ac5f796c964dc655a35163cec9f1e85 SHA512 35982599de717abcbb5a70007b1d3073c18dc217ede180bf6331f04386eb378af5751ab3d934da353ac27d77b824b20bb918226155da9d3d3b599b309b28bbe6
 EBUILD kicad-footprints-9999.ebuild 735 BLAKE2B f80e84bf0658e1024301b2213112f0192e7fa5dfad140e0fe9792d4ab28058e800c9508a0660ca344d63ee7dd5441f4f19c89bf047e29115e17ed2c51fd93b22 SHA512 efd1bfa76d6a51897576ebc48ed9b0381171721173c70f9133d4850cf2e654b440c15c93c14318ce69c7282827c6b1fc9bc135f81766e1900aa77e8dcc28b6f9
 MISC metadata.xml 776 BLAKE2B 30982b2c0cea33ecaaa4284235bd37fdf622f34a3f85ec0a5d2ede84669afef43c07e25af0e60048ea0167cbb8ff38af8ec0a4b0462b0f2efe418e7efde77278 SHA512 b4ccbef5457263dec344709e4ba4a900da9abe252983fd67798a5b1ab9bc1c9d24f6178bbb493db1eac617ff64bb5d31f29df570891751a52a86a6beb55d6d56
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild
new file mode 100644
index 000000000000..90a31fa8cb1f
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-6.0.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+#	 x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-footprints/kicad-footprints-7.0.1.ebuild b/sci-electronics/kicad-footprints/kicad-footprints-7.0.1.ebuild
new file mode 100644
index 000000000000..ba02cb94ca78
--- /dev/null
+++ b/sci-electronics/kicad-footprints/kicad-footprints-7.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools footprint libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-footprints"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-footprints.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-7.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+#	 x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-meta/Manifest b/sci-electronics/kicad-meta/Manifest
index dc88986a7cdf..3b38822566d6 100644
--- a/sci-electronics/kicad-meta/Manifest
+++ b/sci-electronics/kicad-meta/Manifest
@@ -1,3 +1,5 @@
+EBUILD kicad-meta-6.0.11.ebuild 617 BLAKE2B 05643d4f57aae44e91abea1081db65c8e7c1f9b5ab6ce007e6d62626565baaed7e171c4a5f6276d46bcb7487422680a38c70ae32a03968a94319a1dc11fbd89f SHA512 107f4a48578819571b11c57dbb83b73695270c496b15760fe2c7d7cc3f2effeb6fb364d81e77550b6bad5f18b98c6281dbe20f9afdce9c5afd5e6580f6dc3de2
 EBUILD kicad-meta-6.0.9.ebuild 616 BLAKE2B 8e3fca6f3528e7e0cd3d51c83be0eec98e7852bbdfbfd715625662f98eb0684eaefc409ec262b3ecee84df728f1d6c1324cdd679f43440619945b370a1b26368 SHA512 d0ce9fd57afd7d53a3b6007d846e1d04b53e05dae38bc5d1045a4e4225a863889a685f85d8c55d1b7434a407c7e874c512896ce8c496e0dfaeea43c8ca52af39
 EBUILD kicad-meta-7.0.0.ebuild 582 BLAKE2B 2495daf1863ee585888764d8c3cd30f8dc7be809a8c5d2b64bb7c4bfbfc9add3c9a2f566b30670fdcb70e28ecbef2a95d3f0a00f180049ea358b4b241ea17579 SHA512 65b397c9a72abf809154ba5f5d815f32858bff67f58149b43eca8794112080e4bc886c1d1f83538ee5e19d08d144be9fc83d53eb0520aef3cd2c3ac1b0ca6447
+EBUILD kicad-meta-7.0.1.ebuild 582 BLAKE2B 2495daf1863ee585888764d8c3cd30f8dc7be809a8c5d2b64bb7c4bfbfc9add3c9a2f566b30670fdcb70e28ecbef2a95d3f0a00f180049ea358b4b241ea17579 SHA512 65b397c9a72abf809154ba5f5d815f32858bff67f58149b43eca8794112080e4bc886c1d1f83538ee5e19d08d144be9fc83d53eb0520aef3cd2c3ac1b0ca6447
 MISC metadata.xml 625 BLAKE2B b85af17cbbc843d7d841344c73f0812457bf6ef209c44397bfcf5404175dc20a2525fb4b9501ca61ab686c7afb365bc7165b632ec71b907bcfbe7e651df54e0d SHA512 fdf916963a769a8b0f0d0f3ecf737c3e19a928ac3335d042fe9f57b700a9738f1e834a1f42a97efd9171fd3d218ac9f33337b30583516654efb03bc6902869c6
diff --git a/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild b/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild
new file mode 100644
index 000000000000..199f078b2c01
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-6.0.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+IUSE="doc minimal"
+
+RDEPEND="
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
+	doc? (
+		>=app-doc/kicad-doc-${PV}
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
+	)
+"
diff --git a/sci-electronics/kicad-meta/kicad-meta-7.0.1.ebuild b/sci-electronics/kicad-meta/kicad-meta-7.0.1.ebuild
new file mode 100644
index 000000000000..9fa1015e5396
--- /dev/null
+++ b/sci-electronics/kicad-meta/kicad-meta-7.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Electronic Schematic and PCB design tools (meta package)"
+HOMEPAGE="http://www.kicad.org"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+IUSE="doc minimal"
+
+RDEPEND="
+	>=sci-electronics/kicad-${PV}
+	>=sci-electronics/kicad-symbols-${PV}
+	>=sci-electronics/kicad-footprints-${PV}
+	doc? (
+		>=app-doc/kicad-doc-${PV}
+	)
+	!minimal? (
+		>=sci-electronics/kicad-packages3d-${PV}
+		>=sci-electronics/kicad-templates-${PV}
+	)
+"
diff --git a/sci-electronics/kicad-packages3d/Manifest b/sci-electronics/kicad-packages3d/Manifest
index 17e800088f46..3b47f04b5c2a 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1,6 +1,10 @@
+DIST kicad-packages3d-6.0.11.tar.bz2 737065465 BLAKE2B 959ee6137a7d7cd818099bc86b3069cb77d280f60d3c3027fe4ffb02277a65aefc4e4d674bd7ce285fca4afde34482801d65e882c52cb86b9a6199956c22a230 SHA512 83d064ad893322c6ca5b6f8785005749ed7ffed5719a71abb6660557e537a100c4905d2e7dc26a6306381145cd356afa4830c7d90f210f1b9bd57e7e918bdd6d
 DIST kicad-packages3d-6.0.9.tar.gz 953182554 BLAKE2B a0f9810d1236c3ef1b0adae3cc2f1d8172fb52add6a9d5666dd32431725a1d3fd0456119ef21b05bd390ec90fce359b46e846f0af063feb4f8d97bc69da57f68 SHA512 fe014b35ce9071ed48d00481d509fba678dc0bea5170f626de9b18c0e0285cb441fcc635197da40af869e35c50104a9a69d991348d6031293ee166b734ba7cc9
 DIST kicad-packages3d-7.0.0.tar.bz2 746772022 BLAKE2B 4975f0bbee80c05b3f29b6eca1cc699cf81433644042cf4c60365e333383e49a06b948291bf725e530ffa66d2232cb44ab31df4ae73c4db46d6d4e66b77b9091 SHA512 b01022907ea63b360bdfef708e24efe1f9aef7ac48e46b3707971d674ae26aa898888e28c316d508d7930291d161d95828dbbaa967175dab70b97bf1606dcedb
+DIST kicad-packages3d-7.0.1.tar.bz2 768042873 BLAKE2B 1077e2deabfe75bfbaa9c6770c6bd1c273e7699b1b0bb4b88b6a9e2dd3f3becab583c0f2d143070d01021711548d0c6e8630286d0d63904ef4c09f39f5d2234f SHA512 f634ff5449cf5b9b619d09495b8a38fd58445589d73ba98442b2fa134d18b81e50d72eea37724e1460cafd4b1c4c2bb345a1e453371b9298e7d79bf54629d721
+EBUILD kicad-packages3d-6.0.11.ebuild 944 BLAKE2B 9d16319cc7e92f88f05340b2fa8d756ec9eaeba6767fdd0c8bde5e9dc74aaeded6dce665708aadd071c49cb1a25837b5ecf9263d1138583df7884aee45041322 SHA512 d92ddc1831a5f77100562abc4761e6a1abb8cb403e2b944e0af26b1372ce3c72c2c53be69dece06f22a7887c08d3b111add9b2392a33248f317c86ad88085dba
 EBUILD kicad-packages3d-6.0.9.ebuild 941 BLAKE2B a3f3804f26c7c1189a51ae3329e1e87aa7aaf17b9f75480ecb0a6d5d9e44697d6084ffcec9a577eeeb34ee0ab0dcd9b618abcbfe229265e2426c1283ae4560a8 SHA512 3ddeb86a6c24a7d5de43a7d0c6b12b37f1a60805b296bf74ad6cb9a35bf60b5a63127e66d30ccb4b0595c0d9b44723ebe87431e1cce2fcae1cf61ba48a1b3f1e
 EBUILD kicad-packages3d-7.0.0.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
+EBUILD kicad-packages3d-7.0.1.ebuild 842 BLAKE2B c77b6ce82a2f793a318fd81484566e965cdd9cf95adde3b88dc612e78e43e6baa286a2fd1ffb65e8556028780c3e89f93186003fba18b1f7a65e3ec0f499d8a2 SHA512 31df462a42e518312f0f8235ed2b90c7bab7537e3ac4b4c9281b5d941ab455a1f67a1169fc64d0ea484701d88a10174891868e1da4087b7fe77c27851fde578a
 EBUILD kicad-packages3d-9999.ebuild 842 BLAKE2B a22a8effad98c5c2ba00af8a7121b516f5bcd05f1a1077d9d262131370f172f0343f557302a169cdf92fb1c38abe7c8fbf20a01828f055712119f464e4e6a43b SHA512 0f7996683ff97a77a359dd644fdd8ebb6e28b413934012e7a232952c4df8233550e637e722e9dd9251954b1f410d17c3dd5fb489d80baad24ceeda4e0acdaa4d
 MISC metadata.xml 907 BLAKE2B 645bfff1ab4f879a9cbb5994b57c959a06f669b0de25b37a9003b046beed955b54b29c6fe660060b3379d02eb247692bab9afdd6364da59318dbe590e5f8a68a SHA512 533862b4c7d390e749bbe0d745dd015d4aa86731f0478d8beca639a829444fab91ee61a3cf39cde43866e49fdac550fb2433d41f63c46f35aa68c0d5081aa7aa
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
new file mode 100644
index 000000000000..f01fec709899
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${MY_PV}/kicad-packages3D-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN/3d/3D}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+IUSE="+occ"
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0[occ=]"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.1.ebuild
new file mode 100644
index 000000000000..0814793b5346
--- /dev/null
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-7.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools 3D package libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/kicad-packages3D/-/archive/${PV}/kicad-packages3D-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN/3d/3D}-${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+IUSE=""
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-7.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="11G"
diff --git a/sci-electronics/kicad-symbols/Manifest b/sci-electronics/kicad-symbols/Manifest
index 662e6fc4a8cb..1049187031a6 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1,6 +1,10 @@
+DIST kicad-symbols-6.0.11.tar.bz2 2291352 BLAKE2B 4ac716d52cf1f47e5ff3c182d36b712ce729ce1ab2bff2509d34e9bc094f7dc1affad070294e7bd560ba9ab17215d6c7caccace23c961191bc4fbb5edeeae704 SHA512 55c9d4829b5732aa82d8809611f82be737f1e48fc20aff8d1237fc1658060557b86d65f236c6f1a4419f0cc553d0277cb23a23aee69d700a88dafcaf208dbf69
 DIST kicad-symbols-6.0.9.tar.gz 4854079 BLAKE2B ba50c3062dc01145239d0950072bcaa6b61b2dbcf954fcf6e96e0d06c2c9952bd571c81a0e05dcdff462524c38e8c8807752e7d854eb7684397634414b55b8ab SHA512 2cc44ead8029cd502cc5301b4515aa23275d32068e091a0a4a645f6fd9ed88f2b7d329d9faa7e66cde58cedeb47810c66db8e6f9313c2bbfe18e5a272f82a163
 DIST kicad-symbols-7.0.0.tar.bz2 3012408 BLAKE2B 320cd9e05b9140cd5149651c91b68f69c2c23bda0026cb1cacf09447eda72159afc670b51a733ebfb02d89c61c0b60dbc298c53e1190c28fe4525303ca013615 SHA512 d72f01448a395f58a5ac87bfea33d514dc35749f7a529ee03b2a11ed1cc38331f0baaf69662686cf32ed4e629a3b2baf1a53cbcb9507fb8f2e4ffd3421184580
+DIST kicad-symbols-7.0.1.tar.bz2 3012164 BLAKE2B b6bf419247d67f39e868dc05abdbd60f8b6f677bd730fb8250b6517f2f68f740ccbd63be55e2d7c667c557493b42937ca65a0dd6480250372020f14a0c3eea59 SHA512 63cca3de17af08c78c1bb98d58ccf4825b6fd9318abd6c996e8218fd3d6168acc396c5cb1b73fe26ead0da4a91f0e8040f363ed9ae74169cad4ca7965fdd0890
+EBUILD kicad-symbols-6.0.11.ebuild 763 BLAKE2B 390e903f7462c8e930bb8980d2ad52312e7cff1b9e0afbeca72502ffca6fb931bffe5171168446a01309f78868a6e200fc9b323cc3d8afa81569733d33eff9c2 SHA512 6a4f03a4d388abbddc354716d696ec5c52d9c2605356b94a416bcec169305cb32eae1b9e85de56eadb9aad509b01802467e448f56a95a90709b8d4f735a9bcae
 EBUILD kicad-symbols-6.0.9.ebuild 761 BLAKE2B df0699fddef39531d30858151329d495e5b38e07b6555bfe937480aa2bf869281b27df124e8fcc086cd3945b0b0936e58c48fef9cca14377d313a4525d5b3ddc SHA512 ee1c31529a18175fb16f0a396272d4eaf07225f85288425a4952aa563c1c2ba8afe87e2c0f7a1e9ad7f752d0b6a0b478920912654481bf6314f227c528b67c76
 EBUILD kicad-symbols-7.0.0.ebuild 726 BLAKE2B 3bf852a25ec618f3cf20b762286a091930f1edb3af20ba5b4cd113aef39874e5278a05e995159ade3db3cf7fbc2091c1647d4b0e0684b26d5a5c6ce468df498e SHA512 fbe3cf50e9d2607f7f84eb7412069282efda60bf62184f44b9982ccd0d76318b9ca34a4c51485a8e7eb6a59a05cdd2a3bd511d291a8d0d2f610aa442c83209b5
+EBUILD kicad-symbols-7.0.1.ebuild 726 BLAKE2B 3bf852a25ec618f3cf20b762286a091930f1edb3af20ba5b4cd113aef39874e5278a05e995159ade3db3cf7fbc2091c1647d4b0e0684b26d5a5c6ce468df498e SHA512 fbe3cf50e9d2607f7f84eb7412069282efda60bf62184f44b9982ccd0d76318b9ca34a4c51485a8e7eb6a59a05cdd2a3bd511d291a8d0d2f610aa442c83209b5
 EBUILD kicad-symbols-9999.ebuild 726 BLAKE2B 1c3c5480ca643101f345b17bbbc6aae7f578d4e7c905138572bfcffc95e1c863a03a86bd1c33a8df452abb84727260930f083f4e220d0f12483179dd128b6de6 SHA512 4627369c5a495d9a440a2474e421c789df0dd6fe5d443db845c7580b2c357df7305f26b86fbb84daead2ac76d4d199d71d1c45e7c636ea5970ca3c4723c5cc85
 MISC metadata.xml 734 BLAKE2B 3ced3601f6bb8bd6289b8bd2b7d18745643bf151bee1393c12653e722a8bb4f0edcfac97a7ad3b76072af665c7463f71f0f442c653fc9e177cbe520e5c2dc623 SHA512 00b5f7f898380c773481889350fc42bba3211096914dcd73c1a8ee112ea12890aa88dde96ea819689d2a87367da6962b2d402c29c4b0449012df43a9d55af0bb
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-6.0.11.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-6.0.11.ebuild
new file mode 100644
index 000000000000..ff1ab4a87464
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-6.0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-6.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-symbols/kicad-symbols-7.0.1.ebuild b/sci-electronics/kicad-symbols/kicad-symbols-7.0.1.ebuild
new file mode 100644
index 000000000000..26631a5e5f9f
--- /dev/null
+++ b/sci-electronics/kicad-symbols/kicad-symbols-7.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools symbol libraries"
+HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-symbols"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-symbols.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=sci-electronics/kicad-7.0.0"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
diff --git a/sci-electronics/kicad-templates/Manifest b/sci-electronics/kicad-templates/Manifest
index 5f30a2511a4e..1d2cebc50c88 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1,6 +1,10 @@
+DIST kicad-templates-6.0.11.tar.bz2 934873 BLAKE2B 6d1e2bf7396dee79904930d443903a49ce932e61c32a6577a7548ae3c6ee903b75af0278031f0d98c74e4b0b8bc5d90760de6e3127a3ed4c58fa84e52ba7510b SHA512 dc1b8ab6c9a9285084bc4a9f50feb9044e971891096f5b3fc9d0912169c3b1df6ea1c6584ffcf877b0e649f7f6c38e6787edf8a7f2455405751267045d6394bf
 DIST kicad-templates-6.0.9.tar.gz 1057613 BLAKE2B c2c0c78093995629216cbcb93c40a05e1494da90a6cb91909e54fcb115fb7d6e10b3015a94200fef61407a6beccdc0f2bea84319531b39562bdf19ccf243a726 SHA512 f5e82599dc8532b2f286d62e650084b4d0470308a2cf447831027a85ea1028587342d51d4005018449f17fcbc9bd9f6ed850d7e3818c88692906790ef8981471
 DIST kicad-templates-7.0.0.tar.bz2 1419891 BLAKE2B 51747088a14a36a12270c18cd60f56e58a89419bf5b28a9b600b02a35606f6c142af80947e1e3f995c86df44e8af2181e012bfd0884cdccc317d3c1d8387eaf5 SHA512 e9ed2570a671e157ba03a6f89a3fa84983d3b48331f5cab6be2100cabe7004d5b83f15a00cec2fadd31dab5b584b2e51569f6425532ade8363075a300a47d86f
+DIST kicad-templates-7.0.1.tar.bz2 1419796 BLAKE2B ce6f259e8668eb4ed3541cee1aca44259af2a19142cb5ef1f049b40d7d23fac5e48cf13e3b101798d02f0661230c96bdf8f74a802b7bbb3dec13272a498a7e34 SHA512 5214ce5b48c2340feb3d6ce3d882462a6ea1468c53ce5de30d7b608c026b9d51db38b33375d24b845a8196eacdc2dbe5c28f2f1ff22af4c398724fb6566ec2fe
+EBUILD kicad-templates-6.0.11.ebuild 684 BLAKE2B 5f3f6ca769008acad6be96d15c7a9f896093a4ce095f7715087568273c1845f65b7c4d8d7ccc1c7f2ff2bef1b5bec9d60ebc0a2ee3bc44cba06d8227dceb33b8 SHA512 77134e340f487b9d8dbb1790d662ce2dcc4e178fff3e6f8c6bb6edfd8038623f5157fc36c99a7ad5d128c4211c4bd9516f2e31c6d3eb44bf046768084d1e0083
 EBUILD kicad-templates-6.0.9.ebuild 697 BLAKE2B 00eb18651cbdb308b655b4aa1cf11d44dcabac760188f3615a8dfad3043d88c5f5100c8afffb257b38fedd438cd31a7ee6ca73717837f58adf615d08456a874f SHA512 2c69def714554c978d6430a2ca171299ad6987250df342f944d8cdd1e4b8f619522c03f05ba6ba35e2bead88742479c9a2ea12ded7c6ffbde20c3de3e34c446b
 EBUILD kicad-templates-7.0.0.ebuild 563 BLAKE2B 0f0bb850662bc5173d58c090e62bc59b1cf1b695fea6c99f8d3112dea524c61f37f7021cf9d03e33936ca2a1cbcbce26d769baa6b69160faef09f004e4eb626a SHA512 43cc520b754ea277a54f25a5ff21b53b32a2974a643a957a763878e09b4b04dfd94e710ebd431846c5581f3cf1e5d098e15f3cd458d2702141ef15760bc53db4
+EBUILD kicad-templates-7.0.1.ebuild 563 BLAKE2B 0f0bb850662bc5173d58c090e62bc59b1cf1b695fea6c99f8d3112dea524c61f37f7021cf9d03e33936ca2a1cbcbce26d769baa6b69160faef09f004e4eb626a SHA512 43cc520b754ea277a54f25a5ff21b53b32a2974a643a957a763878e09b4b04dfd94e710ebd431846c5581f3cf1e5d098e15f3cd458d2702141ef15760bc53db4
 EBUILD kicad-templates-9999.ebuild 563 BLAKE2B 803a314ee3ade729dc6ecc253cc048baa1f82beb420846ff852c6cbca49c82194294dbe764c67531abfa2f2f8b461d116636db504704a72549e93cc045fae6cd SHA512 ed919607b61c11ccc09522375c5972262a74e153a1974a56eb1195f2f76de8acfe66c8fe73a5042e0b1a72f6d05e96f57ce2a940a4abe332fcc13d82d89d3599
 MISC metadata.xml 555 BLAKE2B 3da578d0a134622513076db9ee939f467173c38b96ca157f95485a799b6f57a6ee07cbb84a0402e8f68be4a44fe8db9b214e2730878449ee44caaf284e0dc2d8 SHA512 274899879d1075fc5e421d7181934e9359ba93c73fe4beb67ab4c28456931b21ff321b36ce1c2e56d37ad8387b75dfc8cffbd0235fadb52ef9c5a4a0cecaa051
diff --git a/sci-electronics/kicad-templates/kicad-templates-6.0.11.ebuild b/sci-electronics/kicad-templates/kicad-templates-6.0.11.ebuild
new file mode 100644
index 000000000000..613273fc7506
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-6.0.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-6.0.0"
diff --git a/sci-electronics/kicad-templates/kicad-templates-7.0.1.ebuild b/sci-electronics/kicad-templates/kicad-templates-7.0.1.ebuild
new file mode 100644
index 000000000000..bffd6445a28e
--- /dev/null
+++ b/sci-electronics/kicad-templates/kicad-templates-7.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools project templates"
+HOMEPAGE="https://github.com/kicad/kicad-templates"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/libraries/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+
+RDEPEND=">=sci-electronics/kicad-7.0.0"
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 365843ffaa36..90d0b105dd10 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -3,9 +3,13 @@ AUX kicad-6.0.9-gcc-13.patch 1094 BLAKE2B 6b09be7cfcc6895fd6d744c8755959c501ce7d
 AUX kicad-7.0.0-werror.patch 682 BLAKE2B 268cf848679ffb5b5aa2389a6392986f908c64861fb6908a864ae41d788f8ac10a21d30b7a20b98409cad7f57191958f9d95d448be7c8070806c585c03d7ce8a SHA512 c30b9a080cc74687b44fb5e547d746c4e3298096e9ffa1bf5a7a2b477efb8d05db8adad7255d6b92eb2c00f739e4fcd79b9c198b3122265d26edc1db5cb4ee5e
 AUX kicad-7.0.0-wxwidgets-version.patch 3627 BLAKE2B 7a0382db010a9ec07069c16d1f87c5763fc8372f2c4be35384d8349cb03e4096d09a9020a2fc2155082ea8a44267f83cdc52d32972cff320e7ec038307ac81d0 SHA512 62a48794fcf609d2a844d23e66715afa4eaae31fe227c965cf368dcad47fbd41557527720218cf3bc25822612ce277a67609b057f5e0dc852cdd5de104bf1b10
 AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e
-DIST kicad-6.0.9.tar.gz 45166663 BLAKE2B e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7 SHA512 49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354
+DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
+DIST kicad-6.0.9.tar.bz2 34045371 BLAKE2B 797f1d10a5405751bc51ec9579c5c50c21b56761c8b59ae99e8a52e50a787f1271053eb4d36e5c2483adee277764ea75300dd50c62a2addeb540e748bf8b93fe SHA512 015335de5d9bbd4acdff8dd7da85847ea0b666d3d4dd0d4c9e7b731cc516cb3575ade231e742a089cc5591ef9e4059f2bedc83677fa85220b9e6cb8ef5776305
 DIST kicad-7.0.0.tar.bz2 42583715 BLAKE2B 24fefe73bce6254bb47fdf21e8a82b7752e3f58cb3ea61220f0cf008c6570a4378f15bad54b81cc9257ec223bdb6128ccfd33f356e738b112c7b0e9481257255 SHA512 cb6f4cf6eee9a583d3a622bf8e48e5b604b047df0d742081cff1e5e387cf97cc1cd3f03fb58a17b44c47085634b95eea642bd1a6805e80807dbe0473c8d19d96
-EBUILD kicad-6.0.9.ebuild 4413 BLAKE2B 2662255dad5503f8ec38f76b748ed0427a831520873de5fa7add55c3e58a21bf84eddb6a7b8d57ff3fefd11279cb648d05f75545706542e39e27671be0e44c15 SHA512 716655029680428508e69c67b3edf8904c8a915ea595c91afda1054a51f0d8cbfa173d9b71384ab5518060bc54e51e5fa3f5427adf79b51ecfb63d0cb6c8a0df
+DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
+EBUILD kicad-6.0.11.ebuild 4393 BLAKE2B 70b921d6e244f1787ef99c338889aa4bd3d4241f5249b824261d8ec8958b932c53f89b5ae2d227e76a6f6f8f0f23387c3c00637c43a0d926107425c4c175fce9 SHA512 5952c8c7c4c61702aebd4440eaca909a47da8dcbf07ea31a5b2559b48939182a8a0150b80078f34aacb42c354677aa524c1fee0767bba543788a996e77e68b4c
+EBUILD kicad-6.0.9-r1.ebuild 4421 BLAKE2B 7eb561511f261cc36ab315eaeabab78a4ea7942f0c726f1efc53205a6ee211c40a5b5c458895e5f484be9afb50117820c9e4fc4edef96b44760913145d181c45 SHA512 0be18ed7cdd690a24f4072653aaecaa1043616f82f94f63a89e3c11228b33384fa96c36c1a04fec9f2ca84af1a3b3579365a79713ac3ed423aac68dfdd626f73
 EBUILD kicad-7.0.0-r1.ebuild 4290 BLAKE2B 13650af670f2d65468abb762c629752c0092d53f390de03302d4c1cf2fc3244f06c41b6573d5c1f611d5c7de4c8379fc41b819e6ae78230e34f666aa1809bb5d SHA512 17ed8e4091350cb33fe5152523cf8fddd051fbc9527c3002dd0c3279eb25117051a41950f01240963ed71c8f7348d0ae967ea15290432aa6c6d4f187079f8566
-EBUILD kicad-9999.ebuild 4204 BLAKE2B 600ae5436ebae56bab432c20c75a0865e65f58b7de9e83301058f67afbbc5eab4660e1758d422a08e822240857aa4cf93f43ef1427948fb21285be6202ac27fd SHA512 77469da750859ba7af444f206d42212683d4f9830355f41743d4ee81d84c3f05662cd588862cd30eabda9377f0d7a918aba9feaca47190947e58bd7474109953
+EBUILD kicad-7.0.1.ebuild 4204 BLAKE2B 02bddb5c564879a0d4961224ddb7b6d979859cb3400bb171b21f8ea8f4b3ab9fb3a75409958c87fea09c6e3b059740ffb1321872cacab2a25e57471f5bcc441b SHA512 e2d31146181217e6983ed5867efefd36802e461b7d4f63ee7cefd83b403bcd6aff8379e019a46277bf891b82572bc674d28882ad86b14ae64bbbf8609f9f203a
+EBUILD kicad-9999.ebuild 4204 BLAKE2B 02bddb5c564879a0d4961224ddb7b6d979859cb3400bb171b21f8ea8f4b3ab9fb3a75409958c87fea09c6e3b059740ffb1321872cacab2a25e57471f5bcc441b SHA512 e2d31146181217e6983ed5867efefd36802e461b7d4f63ee7cefd83b403bcd6aff8379e019a46277bf891b82572bc674d28882ad86b14ae64bbbf8609f9f203a
 MISC metadata.xml 922 BLAKE2B bfdb3ce1ee74c7b6f2da1a5fbe7835e2114af83b594edabab7b7674000462ee6963acee3bb1f384bed0b4a36b0529aebdab801fe3a482b23e742d9186e7684b2 SHA512 575659f3c5d0fc74469ff14f8abaf58776f1d0ffdd16b85e9f617d3e956d2d0c1c7f70aeebf02aa5c7afadcea0e0a589e6fb16f160b398482524fa7ce592ba4e
diff --git a/sci-electronics/kicad/kicad-6.0.11.ebuild b/sci-electronics/kicad/kicad-6.0.11.ebuild
new file mode 100644
index 000000000000..7fbef76e7ab9
--- /dev/null
+++ b/sci-electronics/kicad/kicad-6.0.11.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_9 )
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+COMMON_DEPEND="
+	dev-libs/boost:=[context,nls]
+	<dev-python/wxpython-4.2.0
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	nls? (
+		sys-devel/gettext
+	)
+	occ? (
+		>=sci-libs/opencascade-7.3.0:0=
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-3.0
+	doc? ( app-doc/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="900M"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-scripts-install-fix.patch"
+	"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
+	"${FILESDIR}/${PN}-6.0.9-gcc-13.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+
+		# Merged from separate -i18n package, bug #830274
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_PCM="$(usex pcm)"
+
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+	)
+
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-6.0.9.ebuild b/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
similarity index 98%
rename from sci-electronics/kicad/kicad-6.0.9.ebuild
rename to sci-electronics/kicad/kicad-6.0.9-r1.ebuild
index acb95eeca5df..ae0b2fe12627 100644
--- a/sci-electronics/kicad/kicad-6.0.9.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_9 )
 WX_GTK_VER="3.0-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
@@ -38,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	!sci-electronics/kicad-i18n
 	dev-libs/boost:=[context,nls]
+	<dev-python/wxpython-4.2.0
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
diff --git a/sci-electronics/kicad/kicad-7.0.1.ebuild b/sci-electronics/kicad/kicad-7.0.1.ebuild
new file mode 100644
index 000000000000..b017e4c3fe9d
--- /dev/null
+++ b/sci-electronics/kicad/kicad-7.0.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+WX_GTK_VER="3.2-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+	fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples +ngspice nls openmp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
+COMMON_DEPEND="
+	dev-db/unixODBC
+	dev-libs/boost:=[context,nls]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
+		~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	ngspice? (
+		>sci-electronics/ngspice-27[shared]
+	)
+	nls? (
+		sys-devel/gettext
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND=">=dev-lang/swig-4.0
+	doc? ( app-doc/doxygen )"
+
+if [[ ${PV} == 9999 ]] ; then
+	# x11-misc-util/macros only required on live ebuilds
+	BDEPEND+=" >=x11-misc/util-macros-1.18"
+fi
+
+CHECKREQS_DISK_BUILD="900M"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-werror.patch
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+
+		-DKICAD_SCRIPTING_WXPYTHON=ON
+		-DKICAD_USE_EGL=ON
+
+		-DKICAD_BUILD_I18N="$(usex nls)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
+
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+
+		-DKICAD_SPICE="$(usex ngspice)"
+
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+		-DCMAKE_SKIP_RPATH="ON"
+
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doxygen-docs
+	fi
+}
+
+src_test() {
+	# Test cannot find library in Portage's sandbox. Let's create a link so test can run.
+	ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die
+
+	# LD_LIBRARY_PATH is there to help it pick up the just-built libraries
+	LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dodoc doxygen/eagle-plugin-notes.txt
+
+	if use doc ; then
+		cd doxygen || die
+		dodoc -r out/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 0a613e92f79e..b017e4c3fe9d 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 WX_GTK_VER="3.2-gtk3"
 
 inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 9aaf54984f5b..ebb3347b17e8 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 516e79c3fbaa..e956ebb4a58e 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -5,6 +5,6 @@ DIST gpsd-3.24.tar.xz 3596040 BLAKE2B 999963258aae883df4ae84b8011324971c25ebc84a
 DIST gpsd-3.25.tar.xz 3647488 BLAKE2B 0c6f4eff5d2489e88ef0a35b9c089e30805368d491603e644a917a189c95316750913ec1d393a5a2ae7ebaf9279a4d1f19907333c35652178304c69102262849 SHA512 efc26221deb08ef8f34aed7d56809c1056320700f55d08519f1b44fd0c3c8ffc49672980301970fc096d88a0022d7cf207d329356dd81ca3618b7bedc3b078d6
 EBUILD gpsd-3.23.1-r2.ebuild 6112 BLAKE2B 7dae0719258ebf22ac99055244279a39bbc989e0ad9dc96fa5c7a8f845637f0d04bc150b9b0150539e587371458cbe093e88420fa711379a05a22f889dd47178 SHA512 65b0549032ed7ad26f83d76e53a10f172be1bdf75d5d01df26e2bf03bb50aa10bb25e7dcb77fe280c73a06f00a1502e215e00a727d8aa56dd650e923c3de6f15
 EBUILD gpsd-3.24.ebuild 6318 BLAKE2B 66cf6b2f103a3ab3d1baee4e8247a082954072882dd916c270e7575b6b58f0d0dd8b1f6177a437fb34365fe9a4cbebe5e72371e78e8a5e311787ac306303d7f1 SHA512 68974bdf9e89d903d1d45548452027cf28ea2e2d5caa0fa156dc4a3b6d3718508687c7c913440221b305f543cd4da6d4d4db55798d8c60080ab35f58acac17d8
-EBUILD gpsd-3.25.ebuild 6314 BLAKE2B 1f3ef0da5c61c0cbdba65d316f5fed2330416e4441e046e3a996d9c3d242de0307172736b90a94fa02d8cc2ceb394755f3bce33ce808193432898d0c6fc1fb83 SHA512 93b022583f0ed90bb1391b4280d55ef2802e8535eb807ebeab7d8b737bfa5d5144624a42f1e63886e2c54505159db342eb18564e49450f2d350ab9e7035a5b3f
+EBUILD gpsd-3.25.ebuild 6312 BLAKE2B a07c3fcb12501a68a6bf9fac262fb7d4d49b489335ef8ddcf5caefd2a4646b28c7588463662830d08ed485fe7a4596737b0469f619ea46fab71c590f4f4abeb1 SHA512 cdbbe5d2950a9745775fe1eed6b82f78a8a99303d01d6712d782528bf7f095f4c6864535e99c1e7e1a2724f122c1c315372a508e91d09dc15f302c36408a5220
 EBUILD gpsd-9999.ebuild 6314 BLAKE2B 1f3ef0da5c61c0cbdba65d316f5fed2330416e4441e046e3a996d9c3d242de0307172736b90a94fa02d8cc2ceb394755f3bce33ce808193432898d0c6fc1fb83 SHA512 93b022583f0ed90bb1391b4280d55ef2802e8535eb807ebeab7d8b737bfa5d5144624a42f1e63886e2c54505159db342eb18564e49450f2d350ab9e7035a5b3f
 MISC metadata.xml 1029 BLAKE2B a8bd09a148ce75d7e8a390353834e87f05d4a21e4ac31a1264565c37bef7801542eef52955dae03470f7a8d965d7b2ae446014ad5c7b3a251aa3a9ad0bef0e9c SHA512 cad79d8d94442ecfca1cbe03c137e771d02999db08a494801c524edba6a6648a7b948a00c9f3ebf539f99fa58794acd09923bc077cf19ae126a64bfb4d1ff397
diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild
index 53bc8d53f9fd..621e11994f93 100644
--- a/sci-geosciences/gpsd/gpsd-3.25.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index bb46e406e86d..dfd06d5f02aa 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,5 +1,5 @@
 AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
 DIST routino-3.3.3.tgz 2564198 BLAKE2B 0476e4afb2279c6a93b3d5192a1be580b0ee20fe07b5101c7d590bd3b74873e0205549c2fa621c6444eea0dd0cf0545c9fc054454e04f434d3e57ed750b1df3d SHA512 b037f6ef38b3abef4639d639c3564b42adc742d225108905d0cacb790e4a07593245c537b5550c43874cd6083f37b710b7aec02a0b0669c927804cf30ce34386
 EBUILD routino-3.3.3-r2.ebuild 1639 BLAKE2B 202b9300edfbe011b8599d371c7151fd52deb4a3d79de549e5a112c222c7770bfd00bb258fc6cb1e69cbc24321d9f178acfa8348e04f3f9c7e1ac69e05b077ed SHA512 3d937f4e9574925198add33d52bb4efb1610c2e4aa47c6a9ffa47750ccfebfedd9302c4474c9401f91af69c83efb1568fc4ab29c73c78fd09a93f97e10cd7cec
-EBUILD routino-3.3.3-r4.ebuild 1654 BLAKE2B 85a3fe0439c1dfc818ed9a8ed9d1a5b5ccfcd3ec527021dbeab4f4da4951d228a8b7ac14e3db4b0ed6747301615f4fe3dc8d68c8d3152a7b1dfe6e8f88056f7d SHA512 e8af2ae31e1fc19a335918118dd50d5cf30d554fc8f6d7c96829222170e95e32a8226e1b67f2da42de49b2fdf4243c5c263131e0edcad2c4bfb84497097ac863
+EBUILD routino-3.3.3-r4.ebuild 1652 BLAKE2B 016e79ae1bf1977289f208c09f37c91d6f83640736d8ac79bbcfbb4aef5a379c1c8f24917c8603245eba98bda8403da3f7b4bffb9869b15ddfaa3bcb7897c2c8 SHA512 e34645f7515ced7e112a6659f223784d562b598bfb0872d20760c41565024cac5edb2210f00432a72317bde5ea1db61ce02727db55e3efcc0bab48f8919be66a
 MISC metadata.xml 894 BLAKE2B e9854b11005fdab70046e42a963c65a4e921f2d05572c4591e0ee581316a8ba3d3a5a0df39cf2aa500b1a89bde29fd1aaa459962abb68fdc71b49abd9681db54 SHA512 1397fb38a051f523925f04ab1d77044f2bbbcb2957a724696b54d6c057d49d67e758ae3d5b3c925fbce95f35e95c8b3a191724021bb82d4aa35ea61bc2c2153a
diff --git a/sci-geosciences/routino/routino-3.3.3-r4.ebuild b/sci-geosciences/routino/routino-3.3.3-r4.ebuild
index 3a03984a6ad0..0ee1d6ec0788 100644
--- a/sci-geosciences/routino/routino-3.3.3-r4.ebuild
+++ b/sci-geosciences/routino/routino-3.3.3-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://routino.org/download/${P}.tgz"
 
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0a69c5e3e4a8..db9f0f8d8c3c 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 7631e18e0332..83d94c07ce0c 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,3 +1,3 @@
 DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93
-EBUILD cgnslib-4.3.0.ebuild 1934 BLAKE2B 8f917cedc499a64913e6ddb216c5caa2487540a5d3532853753e1da45f087ac5663f38d9e0a4d7fbc6e9762bb279dcf63c909ab66cfbff41c313f1c6ed044d86 SHA512 5d87190074cc9914d8e70bc43b82d385c838aa0fe60faf052ca4c3e96e30a86808bba0b14a3f7e65f3ced4e1a604e5930df07ecf8fea9c66a6e330b5c76ce671
+EBUILD cgnslib-4.3.0-r1.ebuild 1942 BLAKE2B fe3b51bd3e7302e9b61385d655bace0385f936ae60089f66f597a2064d8516289a6a3ec3000769ce25140c040e5d2c23a67d3f9dfca94acbab47b46b63028450 SHA512 5e4a5e3fc0615284695dfdfbe0454f4a7422acc0d8baf5070eeff8f57ade25d19339bdd5778e57217093f3587cd8f033bd85fc78f648c15678358f48cc93ff10
 MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2
diff --git a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild
similarity index 97%
rename from sci-libs/cgnslib/cgnslib-4.3.0.ebuild
rename to sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild
index 039b318c01be..192837148b5b 100644
--- a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
+++ b/sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
 
 RDEPEND="
-	hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
+	hdf5? ( <sci-libs/hdf5-1.14.0:=[mpi=,szip=] )
 	tools? (
 		dev-lang/tcl:=
 		dev-lang/tk:=
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index d0856dcfc9ea..3f6dfc00209e 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,4 +1,3 @@
-AUX includes.patch 361 BLAKE2B 08417f2e2e3a39f03d714952fc1a5aa7eb73e42783d5d2db631d6406e1644d74e99c3f42eb0424d96dfea808e25c3902b5fb5f31a5c3108860ead1434fe82de5 SHA512 497ca00f1250b4d8dcbf5031ddfdd3c82c8bb6e8ab8c2735c3f32233b8840cdc1195a41be1fc5c5dff4a5d2b385c01f6f31302b8c8edb44e9ef50f3c2a0ea566
-DIST ignition-math6_6.10.0.tar.gz 598228 BLAKE2B 1f67891f755715e14742e0f06cfec4b7ee7da1df192165961b41a4d0744ddbb8066fa8739cd85ccac3134511d0f80ec2c2289a30dbf1960e39229312a9085725 SHA512 3f2bbfd6b2237bda50feb55d52daaf8ecee0ece68a99bb3c264fcd9c67cb01537b168b1a1d4608e4af2ed582393751b215e4fd1fed4c93db5cd39199200b87b1
-EBUILD ignition-math-6.10.0.ebuild 641 BLAKE2B 3d2b5393a3aa7d173e4046a8c8cb45bbf5ca94d2be9585e42a50bbcb7ef959d8d22526107f15e65a0ff876f1ea2ccfbc0f81032fbd410a5eb694949fe94995ea SHA512 8999f6e9bb10df4523df28e954b7b4c97215ff3409347a5116390e0610ff4a19a20c7d232bb68bd4ea3ae678f53cac8491295338378b05e990be86e050f8a17f
+DIST ignition-math6_6.14.0.tar.gz 628564 BLAKE2B 6206f1f35472bf51a8a3bdb8fae26d9879044ea856abd8bcce2cfb5bf16d2638816b3fff7e451c165fec8b2ba82db083d78306d5441c4db3def14b08ddad7556 SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802
+EBUILD ignition-math-6.14.0.ebuild 600 BLAKE2B 8120b8031f47535bd2d552e69f2f711e7746a2692a6fd042ba93c232db3e5afd01ce1cfb4b0a775ff2ca3c440ad097ce0d56dace746f6bb159c1db3fefc7094c SHA512 7e979a121713d8b6c7e91a440821ba4509c38848d5d641129cade353f1b44c124acafa1bf559c0a30c6f96ee0bd355d324aac4725b16a37316b90b1d85d16d91
 MISC metadata.xml 343 BLAKE2B bb5108d0bcc5fe3831a10464432ac25c55c222e552e3c263e03f0a31e506c1de87343bfa99e88eca81f4b46c5ce49439c72b2272d4fdeb86183dff93d9420cb3 SHA512 b15e2a7b1584b98b9611ec8e75846e58fcba9e3f93547f473b43328499ca47695a1d1430ad0e77c319d40c50eccddfeed36771710b794d1116fa0d15e530e386
diff --git a/sci-libs/ignition-math/files/includes.patch b/sci-libs/ignition-math/files/includes.patch
deleted file mode 100644
index 5d7750bcec9a..000000000000
--- a/sci-libs/ignition-math/files/includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ignition-math6_6.4.0/src/RollingMean.cc
-===================================================================
---- ignition-math6_6.4.0.orig/src/RollingMean.cc
-+++ ignition-math6_6.4.0/src/RollingMean.cc
-@@ -17,6 +17,7 @@
- 
- #include <numeric>
- #include <deque>
-+#include <limits>
- #include "ignition/math/RollingMean.hh"
- 
- using namespace ignition::math;
diff --git a/sci-libs/ignition-math/ignition-math-6.10.0.ebuild b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild
similarity index 87%
rename from sci-libs/ignition-math/ignition-math-6.10.0.ebuild
rename to sci-libs/ignition-math/ignition-math-6.14.0.ebuild
index 68e7ffa2c329..d26ecb92b0fc 100644
--- a/sci-libs/ignition-math/ignition-math-6.10.0.ebuild
+++ b/sci-libs/ignition-math/ignition-math-6.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,4 +23,3 @@ BDEPEND="
 	dev-util/ignition-cmake:2"
 
 S="${WORKDIR}/${PN}6_${PV}"
-PATCHES=( "${FILESDIR}/includes.patch" )
diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest
index bb97575bc888..91a010374a9c 100644
--- a/sci-libs/libcifpp/Manifest
+++ b/sci-libs/libcifpp/Manifest
@@ -2,12 +2,9 @@ DIST components-2.0.4.cif.gz 81445161 BLAKE2B 80d538109a716af0273d109151a434e68c
 DIST components-3.0.0.cif.gz 82114845 BLAKE2B 9934110efb9848e8b71e75173bf9c8cfeec1daeef45648296dbcc41641308b9c4e6ff2ef16d86b44ebdb0a200fe6f2a8f13dadac1cce4d8ea2a2961927bf4c94 SHA512 625478378d236ec46130d83545c1b0fbdfb5e9cada3834ac14d4b052e9e460e73523e4438b3356a78d64f569e12cd4c13439b5de56462a10d5c11d0de09d52b8
 DIST libcifpp-2.0.4.tar.gz 960402 BLAKE2B 4650478b187ece13d38c0a5f13c94e6098e3271088a7dd19d72645d52d085304a463387f9d1b1edacbcd03a051b32fbf2384e3287d5ff4835091f2eae2fe2805 SHA512 f4a6b126b376b245d399508e9bc360bcf0451e6bd3cad3127567dd95afb1965c8eb764bb9b0bf26be26695fc5636e509709bdbc9f8c9a00939d049c1634dcae0
 DIST libcifpp-3.0.0.tar.gz 950896 BLAKE2B 8aad3ebea5cc82c2615b6dc6a8a50654375dd9f58ff6c27306bf1415d9658f29f196c5ea9bf0e4f913400b3eba48f19bc11dd97c84b59cf2df94f87afb06d5b7 SHA512 507abed829e4d5194eb22fe73d261295a9814577d7bc53743731e7a1ccb032f763f4bfa0e1b23665d52fabbfa38baca20e6373c14db029705427b6fa773df976
-DIST libcifpp-5.0.5-components.cif.gz 88604747 BLAKE2B 05b914efaff697fa756a2ccd79836aa0a27a5fcf966eece7a3b5476fb37c876449047de00fea852a224b266188d00d1e5e5fa0148f24a1ae0fea01c0ad3415aa SHA512 a39144034836fbac5ff793c6a87d0e1519e63f16175357a3863d56edf2bf015af4dd6859b9afc8c8d9621c7dab752df5a8557149db2cb37983ab095a831fc2fd
-DIST libcifpp-5.0.5.tar.gz 1869555 BLAKE2B 515e27aeebb5e12130649a52ac92d69bbec910ec67fef992100a785f21ee6acaf34e951b2cc430acbfc52336a88337f0b54d6ecd030d784fc3ebe2065321f813 SHA512 730d212a681009b932f61e99dcde77d89ff5ec618781abf897f5e91c103d334ca560329975d32715a2d84f02026b073f46cba3f10a1b382ff82422d49b8dd50e
 DIST libcifpp-5.0.8-components.cif.gz 89984770 BLAKE2B d42147d4da56589ac30de9fc3cdacd43e036f548eebf80a19d878c4bf0be535578eec6b78625e1ba60db53090ce5e4b9a3e59b06705f208b660fb2e37e79d1c2 SHA512 5f9705714816656aa910b571d77966926d66b2724136119857138975f8be5bb2e889e0c9b28ef1340a72857afb5831dba529b96e8dfc796f739e24b0dcab0424
 DIST libcifpp-5.0.8.tar.gz 1873629 BLAKE2B 07257a898b1253995880fea9b416b3a7681122b544f8397d353fda4069c33f4a6c2d5cf2210983acf68dc56cb27a20d780461c7c2485a445855e7b45cccd326d SHA512 4ea67fa4a93218fe96289de95591faa9411508e41e308f4ff470033fb0deb4029a86eafb7ba9295807fe3b350e8cc9f2267f7735ee8b1dbb431ee0275db2b8cc
 EBUILD libcifpp-2.0.4-r1.ebuild 734 BLAKE2B 98776f8cdb01d30fc71a59b859ac0b5a336a79771fdf0f5b953fec5b1e932745f2ed10e26f707c9ba18479546a382acc123b7f45565a6b7fc5cbfe6aea6c524f SHA512 92882477bdd15718a78a980bf00cce6b7271fc9db5d405da95a747ec0ff1b45f797949673ce0799c3a281c17c40f1fd800e24e46ce676f4038699cce692a8954
 EBUILD libcifpp-3.0.0.ebuild 738 BLAKE2B e4577178cba7b208e9dde896997a131729031f916a3b9c67be5d83b8bc9b6e689940959ea132e27d399e6b9be5f3d7faae1b84de8445477c81385967013feb31 SHA512 849c3b2f65fc540bae1dd22cd4c39538728c34f5312c2dab94d9102fe9b59f0a903c60128dfba6bb791bcee5762f1d3a428f61f5190bea582a191012f35707c9
-EBUILD libcifpp-5.0.5.ebuild 769 BLAKE2B 4b966cb06f1f9c9a80bb21503a0b3eff294737abe32a8b56cc8125769559972a612acdad5cc48658f5822821fa0e3013fde1e3551a950777f33d9f54226612f7 SHA512 a8d9030efdd39781d34a74dab90816d929056fda484b7e1c5f9fd88ecd4a45ba09b9da2b522a51a4aa8d59116cb19057b426db3e47f691bfbea505b0714e4b8c
 EBUILD libcifpp-5.0.8.ebuild 870 BLAKE2B fa9206b2a876c9a6ed7b2f47059c2bdec6e81f8663257acadffe13a460d3c4235ebab513809820fcb8c7b875a6ae2351df3485d8fa2d2b1f6b935f768db8b34e SHA512 7cd7303f6925f6574959104244427ae9a7853140e6511d14c23d83c90de12ac803655893aa8af308fff1b7e345b10fe6826b07136f9ed06b5483cb1f892e1366
 MISC metadata.xml 299 BLAKE2B 88091a7fbc350db0c22800bcd0de80ec406f7b8a0187b29d8660978384179f8194f7aa794bf0bd3b3f4ab68ac662ca62479319e218d2622e2a3e470653848251 SHA512 e6bc610ae1cf40584ba3067ece0c0c85d08ad0bbb99f5ecd8281c41b04ff932db838926a6ff238794ff46eb8035eb57c750e088bd3f164180952a9e597544e14
diff --git a/sci-libs/libcifpp/libcifpp-5.0.5.ebuild b/sci-libs/libcifpp/libcifpp-5.0.5.ebuild
deleted file mode 100644
index 6bd4f31ea362..000000000000
--- a/sci-libs/libcifpp/libcifpp-5.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="Code to work with mmCIF and PDB files"
-HOMEPAGE="https://github.com/PDB-REDO/libcifpp"
-SRC_URI="
-	https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	cp "${WORKDIR}"/${P}-components.cif data/components.cif || die
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DCIFPP_DOWNLOAD_CCD=OFF
-		-DCIFPP_INSTALL_UPDATE_SCRIPT=OFF
-		-DENABLE_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index bdddd3f9e1c2..b51128d15afb 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -2,5 +2,5 @@ AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412
 AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263
 AUX med-4.1.0-0003-build-against-hdf5-1.12.patch 4749 BLAKE2B 3a606c27bce6130e83989dd4e16733ced50da0ef21dd40226ffb6f64abbd5f2eca2174f971b4bbf3204df0e6040b86706c007dbf6b821a5bb287b648078d9113 SHA512 ba2fa24e3aeb2be6fa1e7365d7ac57c9ebd8706dd19de7dba67507baafe1f48b7b00051169f27164b4a9e749816220619490d5f0796a0c02f25644569b26f366
 DIST med-4.1.1.tar.gz 50506725 BLAKE2B fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1 SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768
-EBUILD med-4.1.1.ebuild 3421 BLAKE2B f2997a275d728f449bfb20438f962a337419587dead319890665085f87b31f6740007683d5641547388ad359817381b7508730a68833f40851848336e1f14698 SHA512 f9be5c2dc40b58e3df7f80ecadc01ac04d42e21fa30937aacf3c4e7a9a2c3e88bcb9a52bc73b74713a972dc9be5c2b79ace289754e57373622b43ff6caa9dc4e
+EBUILD med-4.1.1-r1.ebuild 3420 BLAKE2B 57dd4c3ffd7c3d9cd7413252ae04a58f0cbe86223e7bca74eafc4caf808c7c194232ada980d652528f727e19a9a12a8e9d098d805d00d7b63169d30b05113de1 SHA512 30c185c5e7b88b8756af77c207138900745e7906721ab9fe675f663c01670754774ce34f366dc154bc128803f614453d1c448ea828f06d03320c39c8f2a31a2d
 MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4
diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1-r1.ebuild
similarity index 98%
rename from sci-libs/med/med-4.1.1.ebuild
rename to sci-libs/med/med-4.1.1-r1.ebuild
index b2c10421a196..9b2d35e26ef3 100644
--- a/sci-libs/med/med-4.1.1.ebuild
+++ b/sci-libs/med/med-4.1.1-r1.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test ) python? ( test )"
 RDEPEND="
 	!sci-libs/libmed
 	dev-lang/tk:0=
-	>=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?]
+	<sci-libs/hdf5-1.14.0:=[fortran?,mpi(+)?]
 	mpi? ( virtual/mpi[fortran?] )
 	python? ( ${PYTHON_DEPS} )
 "
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 69ba9f0a6a08..cde0fbc857fe 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/cadabra/Manifest b/sci-mathematics/cadabra/Manifest
index bb163aa67baa..0bc9e4162539 100644
--- a/sci-mathematics/cadabra/Manifest
+++ b/sci-mathematics/cadabra/Manifest
@@ -1,8 +1,6 @@
 AUX cadabra2-CMake.patch 3184 BLAKE2B afa702834d5eb82a8056307b419fc20bbc2d45b0474994328b70fee383dff415ea37ef2e70c83e9cb7776e06f9295cf5cb9afddddaf857227f7a72f362b61726 SHA512 ddd6b451f81e465d4fef9401340808922bcb1074895173d83d699614e0c967024863848fabdd207f7124ff6396e8c2c75d2ed1425ba73d7bb6d5ac6fe56a87f1
-DIST cadabra-2.4.2.1.tar.gz 25154623 BLAKE2B 99c24728c80c5909df338b9214774123c2aac63e475138b5059c0c7824685827765d7906c17200ab3bad63e08b3637c7eb67b2f25bb3477eab4ca02fcbedbb56 SHA512 9dd280dfaca3cf1def268bca7884b0d00287bba5bfb7b80e8bdf4759f91c83117d146af2a24e05d2a8bdc8a5be412529a805713861a56a7186c35fe07ff8d0db
 DIST cadabra-2.4.2.2.tar.gz 25156757 BLAKE2B 05d4e490d1fa740b3dd505b72d5f4f298e62e234859e81b5bdf865e895ab820b3cd5d6db3ecda1cac0426b031cc5c87428d464bdb66b24cb9b945ababc860a90 SHA512 c5c55abad090d72f981341d94d3e299583f446a4bff1df994a60c740cede9e543b5cdee146dae2a846deec4adf446172e62b0f12deab8c89e7a085ffa7006acf
 DIST cadabra-2.4.3.2.tar.gz 25157173 BLAKE2B 895b91a01f5dedc87294903959ee3aca0234016fce0094f4288c07e2d265f90f834670b9c50dcfa059e46564c773f73f049cf65db74f49932e442d15d68ecd88 SHA512 21c76804442397fa3d5fa407fc74395fc800d01c2a5d84270e9cf3abd875c8ff96e2ba8f8349037797ff4ef3d2b9033c2a1a6af45bb75c3a201acdd7357adb6f
-EBUILD cadabra-2.4.2.1-r1.ebuild 2366 BLAKE2B bb04d2b44dfa890cb72b67988aececd2317433c3b2f88e7e2a15078a647b097804076b48bdc5a6386ced66c4a875e9ab9c5d0a19d01f4655a5bc91ea4ceeff78 SHA512 a81b0bb03307ce1ef3b03772e183cd60a858e2aa04de7ad281d4fadddb7452b69dd5f2d248b2b5cd0a6e6cf67456e3eaa8c1a2bb54c6096200c5d19d104d67b1
 EBUILD cadabra-2.4.2.2-r1.ebuild 2366 BLAKE2B bb04d2b44dfa890cb72b67988aececd2317433c3b2f88e7e2a15078a647b097804076b48bdc5a6386ced66c4a875e9ab9c5d0a19d01f4655a5bc91ea4ceeff78 SHA512 a81b0bb03307ce1ef3b03772e183cd60a858e2aa04de7ad281d4fadddb7452b69dd5f2d248b2b5cd0a6e6cf67456e3eaa8c1a2bb54c6096200c5d19d104d67b1
 EBUILD cadabra-2.4.3.2.ebuild 2365 BLAKE2B 2074e07f0b3f7b4d9186f843a10abfd647f36855bab1d3831a3f079912db36363cc4cb3ce8553fb63d9b2e5538d3274216843c93de2e9d90e1a609d49b415e7f SHA512 0b27c49db0d95481f091833886ddf7ffb876f29f4065a9a821fd1207b1c612d80de92ebd929ffd71385409099a6c3d1d9369fb457e6a51e4ca3b34a6d9cdb4ec
 MISC metadata.xml 1342 BLAKE2B 2f34aae73fc01d4b8fd4326505b7b0785663c62593641d1d0a01f64adc12cbc8676271612ce91258927ac22957a8d5aba53dd2627130582c744bc32c28e0e207 SHA512 41dffbcfae16f8f0702df5a1837b225100761d48817a2d70fa03aca6246b9d3184d60989cf265282286b02a77a126ac82695c2d74c6de91da45e8f64fcb91811
diff --git a/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild b/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
deleted file mode 100644
index 729dbdb870fa..000000000000
--- a/sci-mathematics/cadabra/cadabra-2.4.2.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CADABRA=${PN}${MAJOR}
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit xdg-utils python-single-r1 cmake
-
-DESCRIPTION="Field-theory motivated approach to computer algebra"
-HOMEPAGE="https://cadabra.science/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kpeeters/${CADABRA}.git"
-else
-	SRC_URI="https://github.com/kpeeters/${CADABRA}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/${CADABRA}-${PV}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${MAJOR}"
-IUSE="gtk +jupyter test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/dvipng
-	dev-cpp/glibmm:2
-	dev-db/sqlite:3=
-	dev-libs/boost:=
-	dev-libs/gmp:=[cxx]
-	dev-libs/jsoncpp:=
-	dev-libs/libsigc++:2
-	dev-texlive/texlive-basic
-	$(python_gen_cond_dep '
-		dev-python/gmpy:2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		jupyter? ( dev-python/jupyter[${PYTHON_USEDEP}] )
-	')
-	gtk? ( dev-cpp/gtkmm:3.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
-
-PATCHES=( "${FILESDIR}"/${CADABRA}-CMake.patch )
-
-DOCS=( CODE_OF_CONDUCT.md CONTRIBUTING.md JUPYTER.rst README.rst )
-
-# Because we do not want to pull in "_XDG_DEPEND" dependencies with USE="-gtk"
-xdg_update() {
-	if use gtk ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-src_prepare() {
-	# Clean postinst script which calls libtool and icon-cache update
-	echo '#!/bin/sh' > "${S}"/config/postinst.in || die
-
-	# Fix "PYTHON_EXECUTABLE" in Jupyter kernel
-	sed -i "s|@PYTHON_EXECUTABLE@|${EPYTHON}|"  \
-		"${S}"/jupyterkernel/kernelspec/kernel.json.in || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_SYSTEM_JSONCPP=ON
-		-DPACKAGING_MODE=ON
-		-DUSE_PYTHON_3=ON
-		-DBUILD_AS_CPP_LIBRARY=OFF
-		-DENABLE_JUPYTER=OFF  # special Xeus Jupyter kernel (uses xtl)
-		-DENABLE_MATHEMATICA=OFF
-		-DINSTALL_TARGETS_ONLY=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DENABLE_FRONTEND=$(usex gtk)
-		-DENABLE_PY_JUPYTER=$(usex jupyter)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_update
-}
-
-pkg_postrm() {
-	xdg_update
-}
diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest
index d212fca7abcc..1c891c16441c 100644
--- a/sci-mathematics/cryptominisat/Manifest
+++ b/sci-mathematics/cryptominisat/Manifest
@@ -1,6 +1,4 @@
-AUX cryptominisat-5.8.0-setup.py.in-sysconfig.patch 678 BLAKE2B b42dd9ebed8076e8c46ddf92107bdd776d078c0869a824b87c27876c49818ca96b1455912c3af3957c507b59fadb5ecbdedbd94404a87f4672295553d40ce612 SHA512 9836faddf2d502af08a15a08611dfcd1e476d4155fe6a6a9a68b4d6ff851fa7dd485e0c08ba23920cda43f8fc72e5ec9f05fce816b7b0ead65144daa38490601
+AUX cryptominisat-5.11.4-gcc-13.patch 216 BLAKE2B eac9f21b7e1e4049c27fdf4dcb19ec7aa1a7c0da5839cbb4bb54c20a00c41be0a101f280ba1a881d2529e7c36fe27abb94ea3b4e600d8212ec011abcbcd2fee6 SHA512 b13ea41b6a3a22ed6a171689a40ca4f9bae242f6013d334952776ff66517916960df4a962b55a5e1deab61de8e8a3c973d3c02c2b5e53aac1405a101c5b9e71b
 DIST cryptominisat-5.11.4.tar.gz 1044845 BLAKE2B b6df4e61c5f37d24a61a5c782f08f223c413e19fc2b1625718f7d19d4df8f4d955a92ae447f6c98889927ddc7407b4790092086996a0a32879c7dcb614ca1024 SHA512 8593848c468a6b1ac3d9ae343384aa323fb6ddc17802c9b184c178b9a41314c463b1c5f02ffd19d6e844894c7998e41d6e9b808ed70dcc235aa595607f52bc76
-DIST cryptominisat-5.8.0.tar.gz 943785 BLAKE2B 534af88a8432c7e3da63989cad8fd5e1491bd69a80b44977fa681e0356e857a505a82dc860b0d04d07987e3edae2861da67ec9dd781261e03a1120dc342b9759 SHA512 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496
-EBUILD cryptominisat-5.11.4.ebuild 759 BLAKE2B 90fd6e94487a8da7e2ee691e9634ea4e846aa9bcb7592e91360044955a1e6cb4bfbcbe572f03e7a46f9b4217b303bc34e07e848a4930e360511f6af4b59b4043 SHA512 bf223f972b8835465c9781ec04597f02db3675bf80e10c558e3d0925289d5471c5f87e9e857db152a001898bcc160bef9993faccc52464318adff68bd5c2c974
-EBUILD cryptominisat-5.8.0.ebuild 978 BLAKE2B a412c31536b1c00c949b87f090d7bdc35d7895bc289b09751a81b51fac89488c96080e37d3868d2c2d152962cd5b6a51d89489b6533be2cb60a566cf74860599 SHA512 4f7c2a0501ba66c45198dc671bbea9a3b9814f51b8e1fc1fc5808bd1111b9feff0ae6fab79f324ea4c4ba0042a1c680308e4f0df2b03c89894f431c789041987
+EBUILD cryptominisat-5.11.4.ebuild 812 BLAKE2B 772e5bf7985032fa53ecf5e40e9874535baaac95dbecbc3a5435c2a3f2af85d8ceb83979ff20d6a18a6b05eec525365c74f477edec7cf8a2f4d0dd3e34a70957 SHA512 d05b7762282bd018411a19acef297d876f2e0e57813d7747bfb294881844ffec57695a69f025dcf951a2255d95bf94e6ec9a436b19df0a51ce28d0105c38cf0c
 MISC metadata.xml 858 BLAKE2B 4543d51cedd7b5e5e8508c14dfae420360f9d76ada1b969d855ca2b17b2c967036b29a9f2769a2c78e736c1e449e2b079558cd7460a72d402e9f1ce029ba414a SHA512 e1b39d888ab6c09f8707a164c7f683831a908477b2c7f219f4c9f71161ba84c145836ca2b1665e200f15a6e2ff6ca6318bd16fc40d57ad9c64bd1a4e229fbabc
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
index a4f699cc2afd..6ff76af75ca2 100644
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.11.4-gcc-13.patch )
+
 src_configure() {
 	local -a mycmakeargs=(
 		-DNOBREAKID=ON
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
deleted file mode 100644
index 75dfa7819853..000000000000
--- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit python-single-r1 cmake
-
-DESCRIPTION="Advanced SAT solver with C++ and Python interfaces"
-HOMEPAGE="https://github.com/msoos/cryptominisat/"
-SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2 MIT"
-IUSE="+python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"  # tests require many convoluted bundled (git) modules
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib:=
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNOBREAKID=ON
-		-DNOM4RI=ON
-		-DENABLE_PYTHON_INTERFACE=$(usex python)
-		-DFORCE_PYTHON3=$(usex python)
-		-DENABLE_TESTING=OFF
-	)
-	cmake_src_configure
-}
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
new file mode 100644
index 000000000000..e9c7fade75fe
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
@@ -0,0 +1,11 @@
+index 0cf7910..54cb45e 100644
+--- a/src/ccnr.h
++++ b/src/ccnr.h
+@@ -23,6 +23,7 @@ THE SOFTWARE.
+ #ifndef CCNR_H
+ #define CCNR_H
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "ccnr_mersenne.h"
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
deleted file mode 100644
index 5280f27bbd8f..000000000000
--- a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index b3ab64af4..293eb1f80 100644
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -27,7 +27,7 @@ import sys
- import os
- import platform
- from distutils.core import setup, Extension
--from distutils import sysconfig
-+import sysconfig
- from distutils.cmd import Command
- 
- __PACKAGE_VERSION__ = "0.2.0"
-@@ -59,8 +59,8 @@ def _init_posix(init):
-     Forces g++ instead of gcc on most systems
-     credits to eric jones (eric@enthought.com) (found at Google Groups)
-     """
--    def wrapper():
--        init()
-+    def wrapper(vars):
-+        init(vars)
- 
-         config_vars = sysconfig.get_config_vars()  # by reference
-         if config_vars["MACHDEP"].startswith("sun"):
diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 99e32a0d160b..194ce0a7d794 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -3,5 +3,5 @@ AUX ginac-1.8.6-unicode.patch 755 BLAKE2B e51170a710a0bffca47da33183c32730938e2b
 DIST ginac-1.8.2.tar.bz2 1142428 BLAKE2B 9322ac30cd73c5290b68503a277c43751728a8d774655398038023d87796e35b8d98dff968a14faf162969877ef335b383adfb3fe695dda1357fb0208cba424a SHA512 fc471cdc12b3c2597e4deb65dcca83fc9050c8a2d07a19baf605b060efe9facc9b9ffe824676c8489bdebb6f125f1052f313394d95cc2a91c29b00a45cbc403a
 DIST ginac-1.8.6.tar.bz2 1152914 BLAKE2B 3d3d655cde0f5444fa01b0dde62a48d3c42b5a3b27e00d9608c56677fd031e639b7e4e6ac7c6cf68f807033cbe81432148d5525d76ad176b8dcd0d80aece07a1 SHA512 b10402d722e8216374dabdee9eba9e6de3b6afebd291a368697eb8efcd0eb8148237628bfb74713771c99977ccc46d972bacccaead3fcf35a1ab328744a7fb48
 EBUILD ginac-1.8.2.ebuild 1508 BLAKE2B 3ebf0febb922607b5e8a25eba3de288ae79176704296ea8ad2384d8533dfa4cea7fec509d05835c1df884b7825a637848dee33f09acb41f92f3d5dbb487b32cb SHA512 b10b082f88b71a1ec99b0b1db3693ff6b942390a81186ee21ec675fae85ccc384230945747f702605051a5d30b401dd24c026affe787937e3f71a8f383aae7cb
-EBUILD ginac-1.8.6.ebuild 1550 BLAKE2B 882a51634281e280160fa30fd0f518b2734e210703088b0e2a99e5a184eb69ed7613b31cdcb8d15fc9c3bcbe81fefe208632a520ad42095ac62998dc21760cba SHA512 f55eaa734f998b3862abceec04852f27a1c98bae602b6a9818001f04970f44abad9eabad8483651699605e98ec8a54fe06744752c8b00259fa07df484e900cdb
+EBUILD ginac-1.8.6.ebuild 1548 BLAKE2B 5d53ef75239c80d68bc52c1915000844ea2364952142d4606e80c123a4a3d47d5a41ffbe4689e3da331178aa54eb46649f738431a3b715c34d90b2be76cf10cf SHA512 ebb10a2f6908fc8343270c6ff89513dc1ccc391711a0b600a2568ecdb099491d0c74c5c426a070d6c1a40361b3ef7164b33d7fcb66c581849571974a07f0c532
 MISC metadata.xml 686 BLAKE2B ff4b88d20512b55b99aba22f7f87da2dbde32d4348bce69ffc1ee4488e41c0ec8cb062fedd72794d12671111be8a9df4e8be3dacf3d3379de7c82d18df3a97e8 SHA512 bae9dd2c19bd5e5bc84a3640d9548066cf95053c599a57259633b4a6960b2ea4039ebab692086b94553cffc1478de100754bc82a7157fc78871b9084ee9391e8
diff --git a/sci-mathematics/ginac/ginac-1.8.6.ebuild b/sci-mathematics/ginac/ginac-1.8.6.ebuild
index 512edd467266..0bd93e779910 100644
--- a/sci-mathematics/ginac/ginac-1.8.6.ebuild
+++ b/sci-mathematics/ginac/ginac-1.8.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ginac.de/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index ad3ad9bdf78f..6f5274d967b5 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,11 +1,8 @@
+AUX lean-3.50.3-gcc-13.patch 263 BLAKE2B cf589616f4612319bbe1d21e798787a72da3d0f319cef3ef0042b8baa89d87066867311fd804862d43599a262c64e2b747a6c21415bb69137a3e8e59dd332155 SHA512 013fe4ec983c8ca612621319fad5fe66e081516979e4dace71f24ec72cac8d7fe2a021e701b2bcae1e87209783330c02b799cdb6c1274f7f8d3dc51efaf130b6
 AUX lean-CMakeLists-fix_flags.patch 1285 BLAKE2B 0507e553c1acf2a53c5267932127117d5ae5ba9015a08c88748b3d82c041f8d904d15cd033dd7934ac55c474fa75a5d4a46f680cc887fee37c05c3f5f3832839 SHA512 11a5918847e45aac7bf79e48d8f881ef5cd3e6b09dbb0979f3f0b88fd36458be21ebeb530158da801399a0cdc8fe382444ff338cd793cd9f1bfced90c5d5a71b
 DIST lean-3.49.0.tar.gz 1918154 BLAKE2B 9f9973d00d2d5d5b7d26d50117c27754feb5132e88decd55859432a384dac2897184dcf8d841ad0034854657ac25e462dc69cdbe1cf2040787d108bb7e1370f4 SHA512 b4672843c2e923da8d56b91c14966fc2ec66c573564d68db9c52f9b40f2c97d82497f2ef6424b023c4ae50f6f0c11674e2d79053844ea669d226d0fe24077ade
-DIST lean-3.50.1.tar.gz 1918323 BLAKE2B 3a26a6481a8472941a928a7b33b24231239e553cd4a4af5671f6a05f1fa68a54657518c4775b641239aa55401100e44c2797d7ae572405225657f1f7da8e193c SHA512 df2e5915e8a7f7e278e2d3472afe6cc23fec5de808b0cc1b20365ad41cfd03b1efda80523059a96c6b3d9b8b0ccab311700ee6a5d6c9751454ebe3b2f168cf77
-DIST lean-3.50.2.tar.gz 1918353 BLAKE2B 2a8c41eef0cc3c2d3e1b45ccd2383279a1a91c0de772c5fe3f1ffafc808db4b6e7342f2f72bd4c4120ed4248d60359c6e331f4adc1d26c6328b284549861c4de SHA512 58d085deb0354db0067e86e6097dad7f1543f356d4e50607b8cc049a19d867aa7ea03553bab3799c6ad18d0ef4fa468b0f966512d8bf0076526f90e93195a407
 DIST lean-3.50.3.tar.gz 1918462 BLAKE2B f8cb3857989e4966c12a9b4f4a13403ceab0ae9d33ddf81970ef886fb1f46bfd14bfc15aea498ea360cc801224c60489f0ce3b33fe10bead4dcbf3f6a06eee93 SHA512 849b9e8854585ce119f87e8bea655bcb834f1f986bccbf5ffa148fd4a1aae2030b6be938adbf377f0076361a3d9338802e1af8965f01b9c4d2a0517be330beef
 EBUILD lean-3.49.0.ebuild 1767 BLAKE2B 8b4c2d7aea54b4e93e2f284bf78129fd47ee1d4de6bd2e867151c2e8e3d52c1cf52d1323cd03107c0a30555b94284347a94aa859918e135db9e86fc6559f2352 SHA512 270450c4cb4f7ff4cf8e4f6e4432551d6ba92ba44c86a97797488f471f0c5882afc0f33985bed59a529a7f134e963a5bd10836cb7fff6ba0910f6f831821a75a
-EBUILD lean-3.50.1.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
-EBUILD lean-3.50.2.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
-EBUILD lean-3.50.3.ebuild 1768 BLAKE2B 79dc1a54bd55667913f1dba0204ea845e3ae707f4dfdcbd7c8274d3fe00db9292228975dddfadcac6f068d65b49f076ac47480a3a394f294c40b7174c81b2b40 SHA512 28c85c3af753322f828f05ae20e14a8545a4ef5913572c8c998a4699a7fb3d7092b7bc5f9d2b045f8550b20b6c0ba967c9e9944753ff775a827c15b11c8e2198
-EBUILD lean-3.9999.ebuild 1767 BLAKE2B 39700411a69b0ac91dbb14ef4c12979ca94c6529b7c085bb04b29b667d7852983fcc90519748a506b547141a53a88de196bc693e2c40cc12ea438a383b302728 SHA512 6075af9174d9487b82557cdf4641848fc98de380e77f47308649eb3fac0c32193a92c47223a7146f3ccdc6db1b4d4e1987dd560b44081dfdda3c00c69fd10026
+EBUILD lean-3.50.3.ebuild 1816 BLAKE2B f3d86e33359cb09f3d671218ddbf41a17a360f09bdf1af55e721357b043f337106897628b31a159b791cdfb7afcaf56aff065be16260669529c3b9376643927c SHA512 87d6e40d19b301555f281e330118ff2312abf5e8bbc260b89219e75287c34017a697521e7962e6df914155bc5b84606b32eeec1a53a57413661f5eefc186155e
+EBUILD lean-3.9999.ebuild 1816 BLAKE2B f3d86e33359cb09f3d671218ddbf41a17a360f09bdf1af55e721357b043f337106897628b31a159b791cdfb7afcaf56aff065be16260669529c3b9376643927c SHA512 87d6e40d19b301555f281e330118ff2312abf5e8bbc260b89219e75287c34017a697521e7962e6df914155bc5b84606b32eeec1a53a57413661f5eefc186155e
 MISC metadata.xml 606 BLAKE2B 6478d84a762a59082fdea0a11a95b27c093782228c48dba58dc490ea9ac2cecef54cc3101dc98e385f3a29f85d84af21b7d2ae1a9f089ee0313158ecb44eb0e7 SHA512 02d2ac07b155c7a04c857d397d476a39864d02b10dd81c5830db5e21eb86c6dcff26da552a04717f5f587b326ddf8e2e8d27f1a138f88b391f0199d8004d8cb7
diff --git a/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch b/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch
new file mode 100644
index 000000000000..273dd5161080
--- /dev/null
+++ b/sci-mathematics/lean/files/lean-3.50.3-gcc-13.patch
@@ -0,0 +1,10 @@
+--- a/shell/lean_js_main.cpp
++++ b/shell/lean_js_main.cpp
+@@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
+ 
+ Author: Leonardo de Moura
+ */
++#include <cstdint>
+ #include <iostream>
+ #include <string>
+ #include "shell/lean_js.h"
diff --git a/sci-mathematics/lean/lean-3.50.1.ebuild b/sci-mathematics/lean/lean-3.50.1.ebuild
deleted file mode 100644
index e008b81cf582..000000000000
--- a/sci-mathematics/lean/lean-3.50.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CMAKE_IN_SOURCE_BUILD="ON"
-
-inherit flag-o-matic cmake readme.gentoo-r1
-
-DESCRIPTION="The Lean Theorem Prover"
-HOMEPAGE="https://leanprover-community.github.io/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leanprover-community/lean.git"
-else
-	SRC_URI="https://github.com/leanprover-community/lean/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${S}/src"
-
-LICENSE="Apache-2.0"
-SLOT="0/${MAJOR}"
-IUSE="debug +threads"
-
-RDEPEND="dev-libs/gmp:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch )
-
-src_configure() {
-	local CMAKE_BUILD_TYPE
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	else
-		CMAKE_BUILD_TYPE="Release"
-	fi
-
-	filter-lto
-
-	local mycmakeargs=(
-		-DALPHA=ON
-		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=ON  # bug 833900
-		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
-		-DMULTI_THREAD=$(usex threads)
-		-DUSE_GITHASH=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Disable problematic "style_check" cpplint test,
-		# this also removes the python test dependency
-		--exclude-regex style_check
-	)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS="You probably want to use lean with mathlib, you can either:
-	- Do not install mathlib globally and use local versions
-	- Use leanproject from sci-mathematics/mathlib-tools
-		$ leanproject global-install
-	- Use leanpkg and compile mathlib (which will take some time)
-		$ leanpkg install https://github.com/leanprover-community/mathlib"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-mathematics/lean/lean-3.50.2.ebuild b/sci-mathematics/lean/lean-3.50.2.ebuild
deleted file mode 100644
index e008b81cf582..000000000000
--- a/sci-mathematics/lean/lean-3.50.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MAJOR=$(ver_cut 1)
-CMAKE_IN_SOURCE_BUILD="ON"
-
-inherit flag-o-matic cmake readme.gentoo-r1
-
-DESCRIPTION="The Lean Theorem Prover"
-HOMEPAGE="https://leanprover-community.github.io/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leanprover-community/lean.git"
-else
-	SRC_URI="https://github.com/leanprover-community/lean/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${S}/src"
-
-LICENSE="Apache-2.0"
-SLOT="0/${MAJOR}"
-IUSE="debug +threads"
-
-RDEPEND="dev-libs/gmp:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch )
-
-src_configure() {
-	local CMAKE_BUILD_TYPE
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	else
-		CMAKE_BUILD_TYPE="Release"
-	fi
-
-	filter-lto
-
-	local mycmakeargs=(
-		-DALPHA=ON
-		-DAUTO_THREAD_FINALIZATION=ON
-		-DJSON=ON  # bug 833900
-		-DLEAN_EXTRA_CXX_FLAGS="${CXXFLAGS}"
-		-DMULTI_THREAD=$(usex threads)
-		-DUSE_GITHASH=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Disable problematic "style_check" cpplint test,
-		# this also removes the python test dependency
-		--exclude-regex style_check
-	)
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS="You probably want to use lean with mathlib, you can either:
-	- Do not install mathlib globally and use local versions
-	- Use leanproject from sci-mathematics/mathlib-tools
-		$ leanproject global-install
-	- Use leanpkg and compile mathlib (which will take some time)
-		$ leanpkg install https://github.com/leanprover-community/mathlib"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sci-mathematics/lean/lean-3.50.3.ebuild b/sci-mathematics/lean/lean-3.50.3.ebuild
index e008b81cf582..72a23985077c 100644
--- a/sci-mathematics/lean/lean-3.50.3.ebuild
+++ b/sci-mathematics/lean/lean-3.50.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,10 @@ IUSE="debug +threads"
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.50.3-gcc-13.patch
+	"${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch
+)
 
 src_configure() {
 	local CMAKE_BUILD_TYPE
@@ -39,7 +42,7 @@ src_configure() {
 
 	filter-lto
 
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
 		-DJSON=ON  # bug 833900
@@ -51,7 +54,7 @@ src_configure() {
 }
 
 src_test() {
-	local myctestargs=(
+	local -a myctestargs=(
 		# Disable problematic "style_check" cpplint test,
 		# this also removes the python test dependency
 		--exclude-regex style_check
diff --git a/sci-mathematics/lean/lean-3.9999.ebuild b/sci-mathematics/lean/lean-3.9999.ebuild
index 307c5b95bc1b..72a23985077c 100644
--- a/sci-mathematics/lean/lean-3.9999.ebuild
+++ b/sci-mathematics/lean/lean-3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit flag-o-matic cmake readme.gentoo-r1
 DESCRIPTION="The Lean Theorem Prover"
 HOMEPAGE="https://leanprover-community.github.io/"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/leanprover-community/lean.git"
 else
@@ -27,7 +27,10 @@ IUSE="debug +threads"
 RDEPEND="dev-libs/gmp:="
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.50.3-gcc-13.patch
+	"${FILESDIR}"/${PN}-CMakeLists-fix_flags.patch
+)
 
 src_configure() {
 	local CMAKE_BUILD_TYPE
@@ -39,7 +42,7 @@ src_configure() {
 
 	filter-lto
 
-	local mycmakeargs=(
+	local -a mycmakeargs=(
 		-DALPHA=ON
 		-DAUTO_THREAD_FINALIZATION=ON
 		-DJSON=ON  # bug 833900
@@ -51,7 +54,7 @@ src_configure() {
 }
 
 src_test() {
-	local myctestargs=(
+	local -a myctestargs=(
 		# Disable problematic "style_check" cpplint test,
 		# this also removes the python test dependency
 		--exclude-regex style_check
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 03134ba30055..e43d2adefd12 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -9,6 +9,6 @@ AUX sbcl-2.patch 1072 BLAKE2B 3e16339b7b9acbbfcd424780432be4a4267b994c3a7a8774c9
 AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f93b949a05de9226d19d7898daf998cbedc61a77556c923f3f6f8e57508b73f3cae117f62d214d SHA512 110db85899241e1f9ea8427ffb397737aefe0bb6286d037c2c04cfad9726838521ef6403242aeb1e4246d06f13cf83af84bba38567a99b00ed6a081f17b38ead
 AUX xdg-utils-1.patch 1313 BLAKE2B 35d6f88c505c5b1bb5ecf5691e17522b427a3f035f64de095ba088fa9c6a6076e4c0f7f57794804b588798c2289d36397a95101bde890c363aee9675bf8401e7 SHA512 5e5ab3196cf012ee768d108cc47da25c5afbaffca6f9a1aed9338a7154d377e6baf791d2c7bbe9191b823e056056379f190d8bf7b8ce689f44db892f5e375116
 DIST maxima-5.46.0.tar.gz 47492457 BLAKE2B 3d709c1647357477ef8c92ce1f3b0789664fcd86ebe16cf68a89b84c019cb30bc4896409fbe5236bb4dbb25cf972c17cf612c602e57c4c6100b2d86737715f48 SHA512 6c76292ac270b9d8e91d13035733d12038a69ef3510e70a28793b6116208eccd7bf6387e246e9e8c0a22a2e793b948f1233a56fc863ad8712a35e5b1b92fbeef
-EBUILD maxima-5.46.0-r1.ebuild 5971 BLAKE2B 13ea5cbd3a61c839208a35604c8179666e51e4fb9378dbdbf8a7a1748ff2632e9ec6fb1fd3a68401871ab10989da086f68f2b0facb48e44cb6a963930ea4f0cc SHA512 df5d0612e10d197ccd9155d28be9c36babdbc356672fb766e081faf240119cfc00c3cc4d56564d45aacc5ce65ebc231be8f74f3aa99979ad1a34180da2f3fe27
+EBUILD maxima-5.46.0-r1.ebuild 5970 BLAKE2B c5ba1dd7bed01c671c32e32cb012f5455e47846ed529511b4448d31cb908a814fe595b890546fc655faefde2bcce173fdc7eec53e8839c2499ddef07bd9e6d93 SHA512 3c14fb96c95d1a837c119b0600aeddf47144557e48cb848f23d0fc5858314b9431aa76d9bb907ec7fe6e55aaeaab7f862cb47c8cd92bb1ac8fc183b2c53d721f
 EBUILD maxima-5.46.0.ebuild 5969 BLAKE2B 9a4bee7cb52eff0e41e2456418efb318601ec4a613c4e8daf23141903577f73b893fe77e46a52d350b9ea3fdf6848d80c54e3c05dcd806670449c064de6606e9 SHA512 dea407c64fc8d4b1287e7c728ffc7c8680ec6aa08d0b5850a2c0d2000afeab77539d31f4a250076e56a41540bbe301d21cb2ac2d9fa4716f11e7a590c86161fd
 MISC metadata.xml 1736 BLAKE2B 0ad2ee8af914d2de42315204dc73650507abab4d671b1d531f426aa5d5ce7c9ebfb2815592327efab62768659ba7037419285f242adf4c453117836930fb0a95 SHA512 399a8f29bc3f1a3c4c2c1c926f979fb65c517ed165b95dd4b9585004d45c0075761a278ac928fa03ee7523262ddb930952775dc98b092425c89c1c7ee41293f1
diff --git a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
index 22da4534cb1e..f7a15f268d76 100644
--- a/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.46.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="clisp clozurecl clozurecl64 cmucl ecls emacs gcl gui nls +sbcl vtk X test"
 RESTRICT="test" # bug 838202
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index c4dcea13c7a2..d824a1c28c79 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index 1fff18f82dd3..adacb70f3492 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1,4 +1,5 @@
+AUX labplot-2.9.0-discount-3.patch 3386 BLAKE2B 8b9fba76ca24665279bf96e8875a22d7a841cadd84f0a154ee010d2aa0078520403331589b94528b3816cb6cda8c7b1a369374971e08b9756436c827dbc80702 SHA512 43fa587c33ec12346535cfb8ce6ce2a5faa303ffa9cf574cb6bcd4764142bbb76a04f1f9ea73e82c9a0ade14c6d6cba1644f5a4551ea34a3d3d69fedef481d96
 DIST labplot-2.9.0.tar.xz 21413512 BLAKE2B ab3c579eb64ee4b9b558db63210b1d2210210e1ee2df7fd986d75ebbacab96c4cd05a8fc4698859373e011bd47c55a1abc73d0e8107dd3e3f1b60ce87e1f14d4 SHA512 d06e373e463d9cf3df81eec367167350572975366785b6c88bdab947288fbc21a9eb8e706cb1a831967b8bf0a8039f2f919e14ae7cfb40b21e66f862e38c5d45
-EBUILD labplot-2.9.0-r1.ebuild 2637 BLAKE2B d8c77c21eefdbb37279497934706cdcebd5042265ea17fed65f50cad02a3a6a34ab033f9a9fe520d58c6c31952eb870a881e7c908bef2f91b2186bca12850eb0 SHA512 ba9f08569c72ad6be1952583a41f2d3e04831d96c45f641ded28183636091b5056afaed614603ac37a8bb3027bb4e406e532a7f93051fe8a76e844a63ece5838
+EBUILD labplot-2.9.0-r1.ebuild 2686 BLAKE2B 5abbe320bcbcb9252f6e1dc4d0ff2f1571f207c42a1cf5a8bc98d4e4eaa0b848df71120a50b51d96e60f2ebba50d65502db0b813ea0b4b4d75d5de12bfa44431 SHA512 84e2d132876bf0cabdc9835847200e4ea296abb3a3fb10c61c30e3d3b0c9656b882d9cd6acb790b0db237e23327dd382aa366b034a08aa48b50cf29e20f61caa
 EBUILD labplot-9999.ebuild 2637 BLAKE2B d8c77c21eefdbb37279497934706cdcebd5042265ea17fed65f50cad02a3a6a34ab033f9a9fe520d58c6c31952eb870a881e7c908bef2f91b2186bca12850eb0 SHA512 ba9f08569c72ad6be1952583a41f2d3e04831d96c45f641ded28183636091b5056afaed614603ac37a8bb3027bb4e406e532a7f93051fe8a76e844a63ece5838
 MISC metadata.xml 1328 BLAKE2B 7c5afcd644eb98a6afdaba264e24e225e44075e223c47e10922f2aa7ea4658ad34b6f3a55e82a72109413da8bd41df55c2aeb02d93db12ae154acf116d300706 SHA512 ac715b846c70cf31d8a3f92c291848fb9f6c3e571f3cdadc9670c2eb3211ebf2e96dae4263232544506f2cf4db2bb408beeea2cb322f1ac56c179048bd77ba20
diff --git a/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch
new file mode 100644
index 000000000000..e59c1309888d
--- /dev/null
+++ b/sci-visualization/labplot/files/labplot-2.9.0-discount-3.patch
@@ -0,0 +1,98 @@
+From 06837a859c3cc03b175241d84575f747c2a0a779 Mon Sep 17 00:00:00 2001
+From: Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Date: Mon, 17 Apr 2023 23:15:19 +0200
+Subject: [PATCH] support discount version 3
+
+cherry-picked (and merged) commits from git master:
+80340872e0fd3780065b847000882cd2c6faaf09
+22c553af43ff2afc42a32f8b9f04c6b426f49300
+---
+ CMakeLists.txt                      |  4 ++++
+ cmake/FindDiscount.cmake            |  9 ++++++++-
+ src/backend/worksheet/TextLabel.cpp | 17 +++++++++++++++--
+ 3 files changed, 27 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed478d024..2e28a1aff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -493,6 +493,10 @@ IF (ENABLE_DISCOUNT)
+ 		TYPE OPTIONAL)
+ 	IF (Discount_FOUND)
+ 		add_definitions (-DHAVE_DISCOUNT)
++		MESSAGE (STATUS "Found Markdown Library Discount ${Discount_VERSION}")
++		IF (${Discount_VERSION} VERSION_GREATER "2.99")
++			add_definitions (-DHAVE_DISCOUNT3)
++		ENDIF ()
+ 	ELSE ()
+ 		MESSAGE (STATUS "Discount library NOT FOUND.")
+ 	ENDIF ()
+diff --git a/cmake/FindDiscount.cmake b/cmake/FindDiscount.cmake
+index 4919ad6e1..9dd348649 100644
+--- a/cmake/FindDiscount.cmake
++++ b/cmake/FindDiscount.cmake
+@@ -10,6 +10,11 @@
+ # SPDX-FileCopyrightText: 2018 Sune Vuorela <sune@kde.org>
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_LIBMARKDOWN libmarkdown QUIET)
++
++set(Discount_VERSION ${PC_LIBMARKDOWN_VERSION})
++
+ if (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
+ 
+   # Already in cache
+@@ -19,10 +24,12 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
+ 
+   find_library (Discount_LIBRARIES
+     NAMES markdown libmarkdown
++    HINTS ${PC_LIBMARKDOWN_LIBRARY_DIRS}
+   )
+ 
+   find_path (Discount_INCLUDE_DIR
+     NAMES mkdio.h
++    HINTS ${PC_LIBMARKDOWN_INCLUDE_DIRS}
+   )
+ 
+   include (FindPackageHandleStandardArgs)
+@@ -30,7 +37,7 @@ else (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
+ 
+ endif (Discount_INCLUDE_DIR AND Discount_LIBRARIES)
+ 
+-mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES)
++mark_as_advanced(Discount_INCLUDE_DIR Discount_LIBRARIES Discount_VERSION)
+ 
+ if (Discount_FOUND)
+    add_library(Discount::Lib UNKNOWN IMPORTED)
+diff --git a/src/backend/worksheet/TextLabel.cpp b/src/backend/worksheet/TextLabel.cpp
+index 815dcb785..1c85c0e9e 100644
+--- a/src/backend/worksheet/TextLabel.cpp
++++ b/src/backend/worksheet/TextLabel.cpp
+@@ -576,8 +576,21 @@ void TextLabelPrivate::updateText() {
+ 	case TextLabel::Mode::Markdown: {
+ #ifdef HAVE_DISCOUNT
+ 		auto mdCharArray = textWrapper.text.toUtf8();
+-		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size()+1, 0);
+-		if(!mkd_compile(mdHandle, MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS)) {
++#ifdef HAVE_DISCOUNT3
++		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, nullptr);
++
++		mkd_flag_t* v3flags = mkd_flags();
++		mkd_set_flag_num(v3flags, MKD_LATEX);
++		mkd_set_flag_num(v3flags, MKD_FENCEDCODE);
++		mkd_set_flag_num(v3flags, MKD_GITHUBTAGS);
++
++		if (!mkd_compile(mdHandle, v3flags)) {
++#else
++		MMIOT* mdHandle = mkd_string(mdCharArray.data(), mdCharArray.size() + 1, 0);
++
++		unsigned int flags = MKD_LATEX | MKD_FENCEDCODE | MKD_GITHUBTAGS;
++		if (!mkd_compile(mdHandle, flags)) {
++#endif
+ 			DEBUG(Q_FUNC_INFO << ", Failed to compile the markdown document");
+ 			mkd_cleanup(mdHandle);
+ 			return;
+-- 
+2.40.0
+
diff --git a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild
index c45f80b7f620..30d2be63d7c4 100644
--- a/sci-visualization/labplot/labplot-2.9.0-r1.ebuild
+++ b/sci-visualization/labplot/labplot-2.9.0-r1.ebuild
@@ -72,6 +72,8 @@ BDEPEND="
 	sys-devel/gettext
 "
 
+PATCHES=( "${FILESDIR}/${P}-discount-3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_MQTT=OFF # not packaged
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index c89fee8d423a..2c9a5f34f3b2 100644
Binary files a/sec-keys/Manifest.gz and b/sec-keys/Manifest.gz differ
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 7583963a1df5..d758aabdba5c 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,9 +1,13 @@
-DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
 DIST openpgp-keys-apache-tomcat-10.1.7-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
+DIST openpgp-keys-apache-tomcat-10.1.8-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.87-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.88-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.73-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
-EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+DIST openpgp-keys-apache-tomcat-9.0.74-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.7.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.8.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.87.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.88.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.73.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-9.0.74.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild
similarity index 100%
rename from sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild
rename to sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.8.ebuild
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.88.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.74.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.74.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.74.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b61f02550c6b..42b7d13d4e6f 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 39000326939a..a67a2f3b9fee 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -10,13 +10,11 @@ DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 DIST coreutils-9.2.tar.xz 5773008 BLAKE2B 026e01718d79dd95bf645088d395584cbd422bb318f414a6ad325aea5deeec7aecb63217c1ce8231e81dd3b6fee1c85c60616c57ef8e2e1d0b9d764fa5a68908 SHA512 7e3108fefba4ef995cc73c64ac5f4e09827a44649a97ddd624eb61d67ce82da5ed6dc8c0f79d3e269f5cdb7d43877a61ef5b93194dd905bec432a7e31f9f479c
 DIST coreutils-9.2.tar.xz.sig 833 BLAKE2B 225f6ea9d6c2a2b0e47093b6c10d648b8d847daf0733eeb779eb01cffde47f67b3328bdfb214298d669689f5de76f3c64384a6471dfc4ccc3a238bfc1943e654 SHA512 4219f3103d829841a11bf1fe42ae277a44347e555fbbaf48e5e87cce48deb96753cb6d25f2571b88685a164acb9f016ff7ea02346b799ce954599fa0124ef070
-DIST coreutils-9.2_p20230410.tar.xz 5792328 BLAKE2B d7243e763d2771e132cbc584ffd74e27937227bcfdf316ab83f62e7a0a2bc8ff340c5a6570e688fb134453fc27c166588455e5b0c30ed27b6fa2d554ee7b8fcb SHA512 91d079f8f6abdae21969be1d8ca05ec1649aa2bee03243fc0e5834e82044a60d89573440231829b8de3c38e798ab6ddd298dd167f37b76a8ec538b66d89cccae
-DIST coreutils-9.2_p20230410.tar.xz.sig 833 BLAKE2B 8eba201e29e517f9881e8528f86bc89a6b9866a0c24d47abf326a5f053e8a396e7aae799102ac48d2e65eb5751d2baf75f98cc315b98bd04ca2c6bb69ae7565f SHA512 c918006b4211686a819cbf1e71e58ff0077be4a5a6e82e8a69acc47e877aafc7ef97fa626f307c6102e01b1adaaa6b2290287de7cad14da475feb250a82ade48
+DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd SHA512 242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
+DIST coreutils-9.3.tar.xz.sig 833 BLAKE2B c45ae10ff706907ae65d31228e432f7d6f34acbdb733bf521437d9e2fc75828a59da9d432d894a1ed8b7341f7e15d0e8d4e816e209c799b75c14d0ec055bfdf2 SHA512 522a2072f8ef940228ccdd856a4041c3c16b98e309168ccf2066fe7c1013685ba6cdea8a7317dfa1f4507b37ca016ecedaf54438d4a5007927b0e1a8fd223eb5
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B ae5871d55509dbcd48c3f8b33938edfffca3a48bc2b422546b1bd818e7830b877af08f51605ba0d68299ea63d1f6d8246301223cfa5a29620619cd209cbaa1f5 SHA512 363adf232d9b3d158ec7535e84263286961e3e870ecdee3215162e398125999ccf2d1b76d065a7223d58d04ccd75fd65ab33cf409e155fb2788ca0defdc5094a
 EBUILD coreutils-9.1-r2.ebuild 7114 BLAKE2B 3a80919e840546badf681b0672fcad68e2ac0d9a29586e7a8fd712a11484057364ae015c21b92bfef404f6a9c094d828852d915754bae61ace060c0c6853290e SHA512 77c948b54e48907df14a9ac67b5ed1a36cb11acf709fdf009674b90e878c1efc6b4c449d7f4efcc39110f04692c8c274acc3fa32e242f196b0d8bddb27b963a7
-EBUILD coreutils-9.2-r1.ebuild 7550 BLAKE2B 809301b5eb4c9f8dd69cf734f91bdcab02a40e3a8fe0f54e02f02ad003f2ffaa9a9e68a0fd5b76fa0c7f0a6d29fdb7e7f97aa0d5be9db1d134a57c1da3eee345 SHA512 1bf6247e4205070d98f33ddf3130a5daa3720e4f34589da76f35c4961f14213a2dedf1fe3308b50c88e94a1f434b568661255829939030f445a3f6ea34468968
 EBUILD coreutils-9.2-r2.ebuild 7602 BLAKE2B fab330146b115909182404d078e5929ba954eef08177bc0280f2440d892db89327806ac6a41c376928454a02423f718af22024134b852482017f066a4ea3e318 SHA512 23bdc7fd9c60a404cab98cda770b0889a6b749b829b74e83e8c7de32e454290a0d9cccf235cfd36f7a76fff03283185402f854c90db9ce1a98147f4fc71776a1
-EBUILD coreutils-9.2.ebuild 7500 BLAKE2B 00e7c094f7841dcafc5f107851d15c40d51d16b22b1c13c7948a9b42d9aeeabcdc00fbed61538df79493dca57e35caa5dfdb70418a3096b0fd0b4b0aea5c6229 SHA512 985be8b330fdca61f158c31318e240a1f0fcb66ca8b6238c282a1d88ba4b8ce58b9da0ce195d338eb642bec03555da2f2d92ec3afcdee402381daf66d28dc68e
-EBUILD coreutils-9.2_p20230410.ebuild 7499 BLAKE2B cb0e6157303a421f117ed6060e98f4b4e11f5316a24643dcdeeeae466d79184fb780c8186962e3839e1cbe593da2352dc73d6d52334e793c0c625c7eb33657ec SHA512 978ac9b7a3059a7d30e895b2560241397c89e18c6c0d7ed89b772540b9c0a43c9ff5924176bfe60da43fac40343e6fb6a00c829f5f4ef854611bd6632fcb9577
-EBUILD coreutils-9999.ebuild 7500 BLAKE2B 00e7c094f7841dcafc5f107851d15c40d51d16b22b1c13c7948a9b42d9aeeabcdc00fbed61538df79493dca57e35caa5dfdb70418a3096b0fd0b4b0aea5c6229 SHA512 985be8b330fdca61f158c31318e240a1f0fcb66ca8b6238c282a1d88ba4b8ce58b9da0ce195d338eb642bec03555da2f2d92ec3afcdee402381daf66d28dc68e
+EBUILD coreutils-9.3.ebuild 7478 BLAKE2B 49acdcbf00c12c0cb0fb26b76c4b78dd164deeb40c5accd7c120124c020513b85ccd7dd3c1290f0d4b5c22afeae4af86798acdb1d8867aed2c2436b753eaf974 SHA512 af9619b2f3ff02404eb1fe26814183b92ee75742b7bff3f4c9c27053b2b8bb9a88e568e32007bb6649336a1bbca2638541e9cb1243bc50ebb82f118923e6c463
+EBUILD coreutils-9999.ebuild 7479 BLAKE2B bc1fe0715e31676f62ebbfc8863ded02f72f361e15025f2216777265491b19e8baf29588b89b96e43f8ba4c1669f23f95085333124ee35eabafa32b359333d58 SHA512 25b3a52a7529dacaa5db5babb17d77dd92dcaaea8d9d6831e403a0bcf1157d7935521e1994530c71035cc98fd9439c6a12000c564d0305f055eff8112513ec50
 MISC metadata.xml 1043 BLAKE2B db071746d60a62e435bfd6e297641411320b61a5716dc631150e5a3a19bcd49cc6121d2a404b8875d6927ad0114f28d33e2b21edb3bab49559d50fdc26b056f6 SHA512 65149d4bf9b16f7e1800fe8d9e23fa466307ff3f009e06f3736b4f55bce27ba74bc6d1547e0b2f06dcebfcba0f2d21ef3efdd4073ed4e525a2ebdc6e62190119
diff --git a/sys-apps/coreutils/coreutils-9.2-r1.ebuild b/sys-apps/coreutils/coreutils-9.2-r1.ebuild
deleted file mode 100644
index a6e841cff48b..000000000000
--- a/sys-apps/coreutils/coreutils-9.2-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
-# backport fixes which we want to pick up.
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Note: could put this in devspace, but if it's gone, we don't want
-	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1"
-	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
-	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.xz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
-	"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-fi
-
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="
-	acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	openssl? ( dev-libs/openssl:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-
-		cd "${S}" || die
-		./bootstrap || die
-
-		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
-	elif use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-		"${FILESDIR}"/${P}-cksum-result-reporting.patch
-	)
-
-	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-		$(use_with openssl)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
-		emake -k check VERBOSE=yes
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.2.ebuild b/sys-apps/coreutils/coreutils-9.2.ebuild
deleted file mode 100644
index 1acd3418a030..000000000000
--- a/sys-apps/coreutils/coreutils-9.2.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Try to keep an eye on Fedora's packaging: https://src.fedoraproject.org/rpms/coreutils
-# The upstream coreutils maintianers also maintain the package in Fedora and may
-# backport fixes which we want to pick up.
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/coreutils.git"
-	inherit git-r3
-elif [[ ${PV} == *_p* ]] ; then
-	# Note: could put this in devspace, but if it's gone, we don't want
-	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1"
-	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
-	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
-else
-	SRC_URI="
-		mirror://gnu/${PN}/${P}.tar.xz
-		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
-	"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-fi
-
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="
-	acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	openssl? ( dev-libs/openssl:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-
-		cd "${S}" || die
-		./bootstrap || die
-
-		sed -i -e "s:submodule-checks ?= no-submodule-changes public-submodule-commit:submodule-checks ?= no-submodule-changes:" gnulib/top/maint.mk || die
-	elif use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-	)
-
-	if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-		$(use_with openssl)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \
-		emake -k check VERBOSE=yes
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.2_p20230410.ebuild b/sys-apps/coreutils/coreutils-9.3.ebuild
similarity index 99%
rename from sys-apps/coreutils/coreutils-9.2_p20230410.ebuild
rename to sys-apps/coreutils/coreutils-9.3.ebuild
index dd42f736d4d9..b12ae88e4781 100644
--- a/sys-apps/coreutils/coreutils-9.2_p20230410.ebuild
+++ b/sys-apps/coreutils/coreutils-9.3.ebuild
@@ -142,7 +142,6 @@ src_configure() {
 		# hostname    - net-tools
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
 		$(usex caps '' --disable-libcap)
 		$(use_enable nls)
 		$(use_enable acl)
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild
index 1acd3418a030..d19fa5ca04cb 100644
--- a/sys-apps/coreutils/coreutils-9999.ebuild
+++ b/sys-apps/coreutils/coreutils-9999.ebuild
@@ -142,7 +142,6 @@ src_configure() {
 		# hostname    - net-tools
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
 		$(usex caps '' --disable-libcap)
 		$(use_enable nls)
 		$(use_enable acl)
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index f8e9d5ac8e7f..fdd082811dea 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,7 +1,7 @@
 DIST cracklib-words-2.9.10.gz 5537751 BLAKE2B af3fb563a6f57a7cec0843c01ab2b344f7552029a20158e592b7cff1e93041896aa12c3254488a01e8899f6fb1ce9b16fc52580b92945a566f9fb058abb536b4 SHA512 87166906163bab4b79fae253c409bf75bfdd97befc1960b2aaa41b3f3e44a3362dc80d983b2783beb4a99fb1ce0e52316579cc4ba854a0a94321a804ed408a74
 DIST cracklib-words-2.9.11.xz 4157220 BLAKE2B 1ee0c82a6b7d4bcfedd8f4c99feac0f8de68cce061e41f16962a7f7893bd91443d2677533ea3e9e6a16cb5f8fa37bc502d691552d899dc07bcddcddc762f1354 SHA512 09e4bf6ad6064accc88d9206e2b2dd28f0e80f827c600f510dc9bb8ac5d51454da2dfbd8e80f2683af501b6f298fb53fb4cf2fb2b5d668940cc6f64701ed6730
 DIST cracklib-words-2.9.8.gz 5537586 BLAKE2B ca56229852211094c17b2a612100b5b6e4e4f6aafa7cbfae8f779296370b01e5cae26d7d51dd69af6291946a1781cd19f8652bdff7f358c2e50d26c9e263c2fd SHA512 1700c56b9776b7ae4684b9ab1e784dd7707550bce2149301f662618a4f00a2eb0ba2d1a206c09aac22f7d95bc561544d412d2fdac5008fc3aabc4872e8a74afc
-EBUILD cracklib-words-2.9.10.ebuild 734 BLAKE2B fc55f4c5f752afba5fa646c36eea2d79996f777d03f78f0ce489a9577720daaa01ee52662bc2730a5e3dd06318ac4aa0be29210e30bd926e604b0e7997f9108e SHA512 37c32ac945014996acb84cf5f08fbb64812b9aed1e91b59ca9ff67c19070f34c6117dfb9d9eec7df128dc348a5ad1798989a12b72dd378868bb765b0b0f8c91a
+EBUILD cracklib-words-2.9.10.ebuild 728 BLAKE2B 009d8a7899bbfaf38d8a7ecaabb817797a86f84892dac12bd201feb27a8a6cc6f9431b600b22fff4e985f99216bb8ca2b9a0621c7449c5645237103f5b0e591b SHA512 17eaf4cf0a0b49327a6a65ef403049d7f856084ed184d62b8d9761002b0f2f68673ae68d945c24ad7026e0a96fc4e0a83c9169a0c76fa1a8c1f1043ece370bef
 EBUILD cracklib-words-2.9.11.ebuild 734 BLAKE2B 40d8acb2408161afc3ef9dd4012eacd6f766824c8a7ec4de15c7f89db04ce8e67dadbea9929ef7f32c482419d8d0163ae8b86f3d4fecfc8ce4ffd77a562db96c SHA512 55087c565311b40af9f702e56bbbdc1f688b81de4538ea4262d54f93f134a2ed3122fc25e919a67cfa17da3719452f3d4a34747048649063456cde141dde1f62
 EBUILD cracklib-words-2.9.8.ebuild 728 BLAKE2B b6e97b83706fd6c937d8246b3d31b3c55327eb3fa91078c592369355bc4e5ed72e760ca350439213aa38218378eddc7dd511571a3ea780cfefe8aa7f5c78af8c SHA512 92b24a5dec549ae8641b6d8df8bc84171f7e4ccef9a215cc645887aee3666c36d3dff68109d80ed1462c412c6900f4229f273bdb8051ed4a3a2fa4da8d099b39
 MISC metadata.xml 417 BLAKE2B d57320d6e9f27d403b1fbeb93aab3a2ee1773ccbdafb0d56290a767cf0c4b0d12e20c2fd8a12e63bb132fd0ceaa06b7c7e0d6be9d3ab841e0af67164a3006d10 SHA512 e632e2c3f28aee9318c902efdcf62960d8c2420e0bd7beae9b352d51d34a1c3d92a4fceec0daa32c2d11338b38eebdc9ee7d48951abf9f0d2a82dd58dbb74bca
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild
index a0396e851ca0..b40648fecde2 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.10.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/share/dict
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 3c7755c70c69..5555ccda3448 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -7,5 +7,5 @@ AUX profile_wget.local 128 BLAKE2B d2069517fce414faec2b23f8704fe15683a956af210e6
 DIST firejail-0.9.70.tar.xz 485096 BLAKE2B d5164ba5ee08e80415a84999e4152f1f9c897f50def669731098126cec117aed3cf4b21603aeb13ccbdb1bffa9d48de69dcb19fe7135691e891b9b83f48a5ca1 SHA512 a790ccb711da6c3e52677011d7eb38c482ffb5066498d4586018671ab4ee533e02edb31fda872e0647fd27c00014b04305eafcb56f1f1b07f470aa4fb701cbe5
 DIST firejail-0.9.72.tar.xz 503192 BLAKE2B 3d57b345476cb62399859622c88f5d6c22842da5894045c09bc7d84229ec2a01c494e4e9393b6fba6c668f73c6b7046f9a014a315baa5bc56d1479b9cad178a7 SHA512 846fa5caf6e68c669f76a07d6321ed365bf3c45f7992e8be3784ed99ef508ea8dffc5d6cc5da75eeb37964ad358d61b7959e8590051950951de8ca904d8a49de
 EBUILD firejail-0.9.70.ebuild 3046 BLAKE2B 48f9fc8719e87d123dbb65b2dcc7856c4a6fd5f33c309cef18e4d643b94089fb8af97bd9bf214722fa1255853477839495b71d9dedb7ea7ab5ae66ca702f31cb SHA512 28a1c279e453a27b57a2759f9624bbfbb6d9c372bba58b4fb33a2a1e440dbc3b97b23449bffee9102d869c881f2743930c68fcf45335103017b7439c2cec37a8
-EBUILD firejail-0.9.72.ebuild 3568 BLAKE2B 256a11b122ade41805282b4aad62cb731b1806d80e113e245306c9d778355695dc8ee6f67811d778fe3b54ab7b7e7ac3943df01274a1d6f36579bc14865e9881 SHA512 047cd9d77ac04282ceaae57cdabc0c0522058391a4e781cbeac4988a7f871416e94168aebb05f0be21334f0e84cec72f67d40a3c59cf853728eedf8886c8ec52
+EBUILD firejail-0.9.72.ebuild 3567 BLAKE2B 256542643d8cae9c808bb56dd8513ef53cdeacc25cdbf6cee6ef6d3a26fe6bae4cdbcbfb7a146cdf4e40bd99729cd4dfb349d584f77bb8357372f16c14ad9ce8 SHA512 80e279a187cbf556cae30db5104494b2f43d614de89f52c7fb9140056cc72db7885b1b5443101eeec81813b02df16d25f722528436b9d82b063fd38ec692697a
 MISC metadata.xml 1674 BLAKE2B ccb5e94f6e55a8d1864cb6a1d15239ed0a5dd76173a9c20c1162bb55f1ca97e48f1c09902d429bd1086c7b1b014a146c9eb27f0115941e6f7a44cf8aff690e27 SHA512 e8b6c84d5413f6dd33cfe60c111e51a59c89dc95f874c02e38451639ebd05646e49421852cedeef1f101309d73f2aabf6dea1da664f1a6596fce00c0bb2fffae
diff --git a/sys-apps/firejail/firejail-0.9.72.ebuild b/sys-apps/firejail/firejail-0.9.72.ebuild
index 2299d26d5829..85c24854379a 100644
--- a/sys-apps/firejail/firejail-0.9.72.ebuild
+++ b/sys-apps/firejail/firejail-0.9.72.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index f7c992509b41..5fef64d594d2 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -5,7 +5,7 @@ DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152
 DIST flatpak-1.14.1.tar.xz 1626500 BLAKE2B bf33dcd5a0f0289e5bff32794012dcfc45dcdbb11ef0da5c68769c18b1bcd12fcc0308ea275a7532f59998db6afa019746313387b0f9636c7d9b91ceb7d66665 SHA512 1f22622b9a797b644b5fe9d26c3c4ec3f6b1a3b81a12d498e5aeeecb1a965c9aaa5c1d18843c938f116855bbbed3a8d9866997440f86241abe70eae13be7cdcb
 DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
 EBUILD flatpak-1.12.3-r1.ebuild 2520 BLAKE2B 1164a0b45277b5352f03f59cac94dba8cf9107a7f620bab0b1c1b64173c67bf2a7aa80294c0e3869743bed0387f3e0a90618ab85a1bcf098c550243bed899d8a SHA512 e53ad1f5cd51861d4b687c6212577631521c743bf4fbb18b544c8c8df9e7720e50c87a8e54a01ea27bd649f4e1f6feea19c5f5b1abcf6365ce8fa3b62fc5c849
-EBUILD flatpak-1.12.8.ebuild 2524 BLAKE2B 2c807dea263ed1f6cfafd6f7adc1e9bf4f95f98e3916c53c2cdf273cd2493f6a0996832c919b108316a9f13e818f858ee1c6c9932767a69f067787516991e9ad SHA512 a0290e67752a99df6572c1a795da29f61a4c128ce52e29fc9b0c52d17374ad07bdfd9d84d9e63bf0d825b007f42299dcc263ca3ae564ca89720bac1ff9d49ec7
+EBUILD flatpak-1.12.8.ebuild 2522 BLAKE2B e5a62e83a294233eb1bc5241a285e159bfffc374485610f88aec383383cc5f01c5d68c729c06d01960bce201384a6c740304b42428bb5ce01da8e4e66a533dde SHA512 801f8dd723259a2f071fc6a8a491c2e7f7a5217f710325825f55b390db626d688396180f558419e103ded1dd6fd63432bc7f81eca8850ba92207f922fcccdef3
 EBUILD flatpak-1.14.1.ebuild 2626 BLAKE2B 0276683806ca4180a9addbb33bdb1edf23ec8623ddd2f85238a82342a4426f8960d02b76f03b0099116e727bbc3c8e4df698ab451f63251f4c0fbc89921697d8 SHA512 4788847c696f9177459613d09b79f9414d5b773f790fa96c528d7ca7e17e6c423c08a57cdedc94a71edb42e7f07c2577304f691df1db24db77d931156ae4ccdd
-EBUILD flatpak-1.14.4-r1.ebuild 2726 BLAKE2B d5a0a567faf9282b4d84514181b97ed64ffbd411e41868eac6c33feb4fc75f1e301b9a8f5bfcf9838e4aeda314dee390607ad3ae871a5a54cc4c0bb329ba433d SHA512 98a4bcdb2fc063ce9374af50cc633387df71bb2444033925ae1e664ac7f7acc4d058875d79de740ca7c42a75fddb939d0a6dd21fa4fda53f7e520c4fae4f6e3d
+EBUILD flatpak-1.14.4-r1.ebuild 2724 BLAKE2B ea0642781cfa494ab49ee934238033578a314cddfa3303198a13a7c9571ad9f77a4ca4961d4807d10f8a50bd96d24497f82b808178adb4bf76ede77a2eee28c9 SHA512 b862fc242c19086446e5e336a70027d5e1b6b11d50755ca2e4afe58672da3b1579e42edfb9769970221e326746b056e6abc78c75586c9437c13bd932609551e2
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.8.ebuild b/sys-apps/flatpak/flatpak-1.12.8.ebuild
index 6983ea31deb9..9bcc5a2c13e8 100644
--- a/sys-apps/flatpak/flatpak-1.12.8.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc introspection policykit seccomp systemd X"
 RESTRICT="test"
 
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
index 859b8ef2a2a8..dfc593ca8189 100644
--- a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc introspection policykit seccomp systemd X"
 RESTRICT="test"
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 0a2bcc8820df..8e981cd25678 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,8 +1,8 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.46.tar.gz 247679 BLAKE2B 55490afc179e1e56a58408e8a2b7ebd5376ffee25cb61f2838a47cc97ad1e4eadabcc7f74e5cc2a2d9217917eb42517cf01766de2e82b50a3500bdbe263b0d88 SHA512 7c837e4b553511f0621944222ca0d35bd553a9888bd482ca0f8f3d2923d5b51cbd1f1c2f33cccb26d9f13dfb488939b95064673bedb7fcbf78d68664df2678c7
-DIST openrc-0.47.tar.gz 249789 BLAKE2B db97cea45fc24aadc5c8b8d710070f846b2d5748c4b0fddf63227324444a54f506129b8885e9f62537f5dd408f0f418667eb0c9c29007e45a400f752b9ba5e99 SHA512 5b1145985e1d210842aa364712ab570d0661b98267a1faf656309b0d7ac03beccd699269955d1995e84e483ceb7f2c66cdf2da895e2ee1133a133d3fe7cac1a7
+DIST openrc-0.47.1.tar.gz 249760 BLAKE2B 3b5afa7e2b0d20801bf2a172b592180fd84d0653f97064ef6b25ed37d33a39c91f02a3fd8a542bd058b33f90d1a8a215a81d2bd3409594151c531b7da2c4fe3b SHA512 83a7b4723d1684efefd1ff311c6cf6de5d8a9db008ff6deeb6d77bddb3d0df7fbeef3942021dcb6e86d28a0cbd64650a910f49082d4c5bd623097da9bb06f244
 EBUILD openrc-0.46.ebuild 4547 BLAKE2B e0fdbd7a9668d0b0cac96e67cae7c9ca05b995857a16784e9c71dc2504d9e9f546c08f5163ec9f18c93b641a1e3a8333d74df07659215bd8b11356a0d48640f7 SHA512 caca44a4aefe5fa61be9e023c14b80d65630db0fdea7e3ed76b31b33168dcfd38228c3c3599e8217cd76fdfb28f44536816efe9c2a90fb053960886c174fe044
-EBUILD openrc-0.47.ebuild 4555 BLAKE2B 708488c77fc079d6481417f6d182b8f513bd85d5d905f3ac2454a2baa995f64cada2ad3febe1cf0c36901da34c31c25c4412958aa332868e1a0999cb7d634378 SHA512 ac43059aa5c472c7ac4ab4023ab67057c83518ee526894f2abe6bb325c154104f43150e33130eeb9b87d7ac09b6d20c1dc8c2d74496ed909db510693aa7e3333
+EBUILD openrc-0.47.1.ebuild 4555 BLAKE2B 708488c77fc079d6481417f6d182b8f513bd85d5d905f3ac2454a2baa995f64cada2ad3febe1cf0c36901da34c31c25c4412958aa332868e1a0999cb7d634378 SHA512 ac43059aa5c472c7ac4ab4023ab67057c83518ee526894f2abe6bb325c154104f43150e33130eeb9b87d7ac09b6d20c1dc8c2d74496ed909db510693aa7e3333
 EBUILD openrc-9999.ebuild 4555 BLAKE2B 708488c77fc079d6481417f6d182b8f513bd85d5d905f3ac2454a2baa995f64cada2ad3febe1cf0c36901da34c31c25c4412958aa332868e1a0999cb7d634378 SHA512 ac43059aa5c472c7ac4ab4023ab67057c83518ee526894f2abe6bb325c154104f43150e33130eeb9b87d7ac09b6d20c1dc8c2d74496ed909db510693aa7e3333
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.47.ebuild b/sys-apps/openrc/openrc-0.47.1.ebuild
similarity index 100%
rename from sys-apps/openrc/openrc-0.47.ebuild
rename to sys-apps/openrc/openrc-0.47.1.ebuild
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index a741bb6b6cee..656c9188fc3d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,6 +4,7 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
+AUX shadow-4.13-CVE-2023-29383.patch 3022 BLAKE2B 7ad4eeef9bbaf49b8388b7bbcfd2b814ed8862056242085d7261064f7447e610f3476cb45fb57acbe0b5eb1486389bdf93dcc196853c7fe4555750d2c0dcd1c8 SHA512 dd042d4be4dcbcdf63293598530225454cc7818e7ed6c59ab00fb19517b8ec503f6f82de0d347cc03dfcd1d65a1f65f623181838710db6d4fec84b14d7ffe530
 AUX shadow-4.13-configure-clang16.patch 1129 BLAKE2B 701c7e417c57265d9a7a2ee8eb6620ef6846018de24edacc04d0d4f63ff2e7e0a67382c459003d2bfa11e4dd3a49a227464315a4ef115da58c27889d7bdd7226 SHA512 057ea8a546953bea88ecb0b787b37d24113ea4881a9f86e55318647f85f8b56e204dbf3815811897d0cad2a8e50427c9fa84b6389e332e26c8cacc690835a942
 DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc
 DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9
@@ -11,4 +12,5 @@ DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3a
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 EBUILD shadow-4.12.3-r1.ebuild 6482 BLAKE2B fd4ade28140346a1a708eb0cd2a3f33464011f2163a67cfa1b3d72e0d066a9665a76aed66e3cb6ccd7cf511cf32334cd9e0d5de93a7514af578ea1bf30397e55 SHA512 f945fddc472d49a765048f0222727fe70809af8a948093cba79e98d3fd89a7cea0cba2e5b4c2d19c7905b1efe26cd287bcf2769893d36bf90b43b5c78dab378a
 EBUILD shadow-4.13-r2.ebuild 6650 BLAKE2B 3f4a3121cbac224a65ab1351129690216653ee38882cd131cf06de046e5c1a9197a0966fcfe404a24e9bb5d307739862ffc4a89902e22ffe480d385465578bdd SHA512 9ccca926f3c8274be04057562e8566a326a0322ba6e679c825bee054c77c994af0f76cf816cab7be745ef043807c421cdfd341eea1a6b3d9d3f5158250e54579
+EBUILD shadow-4.13-r3.ebuild 6691 BLAKE2B d0c7fc3f67abff01e1d4e837e48070f7e2ffb9d1c207ddfa0473fce913f5696dad249392a86d4c0e7f4d2d549544b2496707d5070138eee3a2921c102b385197 SHA512 933cf33c7134e40bd1d3f8802590605a2df5c0c6943358098b9e7cb62a97e7f89e4aa8a903a92c64182f92aca888dbbd2c326b8ea4eb5501f2805c36f70c74ef
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/files/shadow-4.13-CVE-2023-29383.patch b/sys-apps/shadow/files/shadow-4.13-CVE-2023-29383.patch
new file mode 100644
index 000000000000..49868ba67c96
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.13-CVE-2023-29383.patch
@@ -0,0 +1,100 @@
+From e5905c4b84d4fb90aefcd96ee618411ebfac663d Mon Sep 17 00:00:00 2001
+From: tomspiderlabs <128755403+tomspiderlabs@users.noreply.github.com>
+Date: Thu, 23 Mar 2023 23:39:38 +0000
+Subject: [PATCH] Added control character check
+
+Added control character check, returning -1 (to "err") if control characters are present.
+---
+ lib/fields.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/fields.c b/lib/fields.c
+index 640be931f..fb51b5829 100644
+--- a/lib/fields.c
++++ b/lib/fields.c
+@@ -21,9 +21,9 @@
+  *
+  * The supplied field is scanned for non-printable and other illegal
+  * characters.
+- *  + -1 is returned if an illegal character is present.
+- *  +  1 is returned if no illegal characters are present, but the field
+- *       contains a non-printable character.
++ *  + -1 is returned if an illegal or control character is present.
++ *  +  1 is returned if no illegal or control characters are present,
++ *       but the field contains a non-printable character.
+  *  +  0 is returned otherwise.
+  */
+ int valid_field (const char *field, const char *illegal)
+@@ -45,10 +45,13 @@ int valid_field (const char *field, const char *illegal)
+ 	}
+ 
+ 	if (0 == err) {
+-		/* Search if there are some non-printable characters */
++		/* Search if there are non-printable or control characters */
+ 		for (cp = field; '\0' != *cp; cp++) {
+ 			if (!isprint (*cp)) {
+ 				err = 1;
++			}
++			if (!iscntrl (*cp)) {
++				err = -1;
+ 				break;
+ 			}
+ 		}
+From 2eaea70111f65b16d55998386e4ceb4273c19eb4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Fri, 31 Mar 2023 14:46:50 +0200
+Subject: [PATCH] Overhaul valid_field()
+
+e5905c4b ("Added control character check") introduced checking for
+control characters but had the logic inverted, so it rejects all
+characters that are not control ones.
+
+Cast the character to `unsigned char` before passing to the character
+checking functions to avoid UB.
+
+Use strpbrk(3) for the illegal character test and return early.
+---
+ lib/fields.c | 24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/lib/fields.c b/lib/fields.c
+index fb51b5829..539292485 100644
+--- a/lib/fields.c
++++ b/lib/fields.c
+@@ -37,26 +37,22 @@ int valid_field (const char *field, const char *illegal)
+ 
+ 	/* For each character of field, search if it appears in the list
+ 	 * of illegal characters. */
++	if (illegal && NULL != strpbrk (field, illegal)) {
++		return -1;
++	}
++
++	/* Search if there are non-printable or control characters */
+ 	for (cp = field; '\0' != *cp; cp++) {
+-		if (strchr (illegal, *cp) != NULL) {
++		unsigned char c = *cp;
++		if (!isprint (c)) {
++			err = 1;
++		}
++		if (iscntrl (c)) {
+ 			err = -1;
+ 			break;
+ 		}
+ 	}
+ 
+-	if (0 == err) {
+-		/* Search if there are non-printable or control characters */
+-		for (cp = field; '\0' != *cp; cp++) {
+-			if (!isprint (*cp)) {
+-				err = 1;
+-			}
+-			if (!iscntrl (*cp)) {
+-				err = -1;
+-				break;
+-			}
+-		}
+-	}
+-
+ 	return err;
+ }
+ 
diff --git a/sys-apps/shadow/shadow-4.13-r3.ebuild b/sys-apps/shadow/shadow-4.13-r3.ebuild
new file mode 100644
index 000000000000..5259eab41899
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.13-r3.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Upstream sometimes pushes releases as pre-releases before marking them
+# official. Don't keyword the pre-releases!
+# Check https://github.com/shadow-maint/shadow/releases.
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sergehallyn.asc
+inherit libtool pam verify-sig
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz.asc )"
+
+LICENSE="BSD GPL-2"
+# Subslot is for libsubid's SONAME.
+SLOT="0/4"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+	verify-sig? ( sec-keys/openpgp-keys-sergehallyn )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-clang16.patch
+	"${FILESDIR}"/${P}-CVE-2023-29383.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--disable-static
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh chfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# Comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# Remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete || die
+
+	if ! use su ; then
+		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Missing entries from /etc/passwd can cause odd system blips.
+	# See bug #829872.
+	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
+		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
+	fi
+
+	# Enable shadow groups.
+	if [[ ! -f "${EROOT}"/etc/gshadow ]] ; then
+		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
+			grpconv -R "${EROOT:-/}"
+		else
+			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 09a968b482f5..5c2ce6d8a563 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,9 +10,12 @@ DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
 DIST util-linux-2.39-rc2.tar.sign 833 BLAKE2B ec2ea0c2034b5e8f24c72610e53acc4c922d3d4b84ffd31c3b51849e60a99a6e9bf3e17b773e222f89bc1fe33fb06722e2770b981c7dcc4519bec4db797d8348 SHA512 20b1f2ec5368c74f751238451be9ec5f8f74d8c63d331365b00ed06144f6874fe3f44e062e7b52c5d0a05c650353a741c1594e150e58a16544e5ffc8ed100a5b
 DIST util-linux-2.39-rc2.tar.xz 8080452 BLAKE2B d2476d1aff1c2e4e3cb3d4b71fa3410ce4db26448139dc439865b03d108acf4c797eb92e9edc2451dca099116fda8950b529f1b22b657d47268164642fe794a6 SHA512 11f5b8ed1eb90a4e7161369eafcf0157b205aeded221cd435f95a79d01901bdef289660486849778b3d3c15500db593cad24e0a7f87f52968c9c292ea68040c0
+DIST util-linux-2.39-rc3.tar.sign 833 BLAKE2B da99dfaf40efd052414c30ae172ad1a42654d3fcd7fc41fe8ba48f99db3e3b88c2fde863351cd5d354d5a5191e191e21f4867a8e20453e2512e2cc815f591000 SHA512 8a311c1bb680f1c71221a9e512bf42f13c7d5f8fb0b888dc7aac04a2e0da6315f58631fc315aa73d34b8275a48c9adfe5d5676fcce905f75d5c88f8aac3abf0f
+DIST util-linux-2.39-rc3.tar.xz 8106892 BLAKE2B 514f26cf624a39f271a8987a38d51bd36e5494bea5f859abfd67fd4924495457e46519b712c52578c94210aa8bddab707a5ec699be3bb798c8ff22a17d3c4931 SHA512 8a93d32a5ceb38d50a4b2c8bfa48bcab7ec9b758c89b5a1a4f7fd74558dce37385bd7ea203345148d4389de4ea60ec42058f9d7889a8075d3e616773d085427e
 EBUILD util-linux-2.37.4.ebuild 9432 BLAKE2B 95802f30ef4710461b1bb88389772905ff78cb0ebafe01283dcbd52c4abfa364d8249264dbdc64606756dc2f8fed6ddb57b8a84e50f7477ef17c0191db134603 SHA512 5aa1695d2d4ea6bf1e9c9380bd0ba88d9bf6b73de6c3457a739a3fac7a5cd6a0bcb521a8342d52daecf0603988aeb520dacb2161b8eb647773fd9a2fa994f8a9
 EBUILD util-linux-2.38.1-r2.ebuild 10527 BLAKE2B ba6415f3f7dc35bc3f67a4797423c5ac907b81795d0e336e73a49ce955dd0ac9aac41148c58f30ba7bd599e6bab9b492ba59719a7e03cdf3104763918e9b31a1 SHA512 e5855ae8630f926438e00d32caad189473ef8c3cbeeb66580009194c25b5fc82825537647f9e677f8df69e2a7dc195353cb73abfb7873ab5d52d314a0f19ca0c
 EBUILD util-linux-2.38.1.ebuild 10830 BLAKE2B 213ecd0e198cd70cffaeb317a7d144a7e375fdfdc00ad83195be58359c27adca275480054f57274eac5e81dad91dcf5b657689294d526c82a90092e370f32f7c SHA512 409dc4baf0fcd2fae478bda8731c61f4b48a6845a660100bddff9c6cefab7ca07b1ae6b442676e633903b4fb56445d0e185ab84cf3562b646059a837855dc7ce
 EBUILD util-linux-2.39_rc2.ebuild 10483 BLAKE2B cc53586a0f811ae4ace965cf8e485af584c290330a7630e0ccbc50a825d454c12be6ee5f055ecf828f5867e3e5a1f4ce1c336d75e5e8fbd33d3067bbfc061148 SHA512 42846b166641bef95c03ecd827ea77a61daab3579435611e03d7b855b36697b033c7a40402c4c07f93d10e119cd55d1caa4bfa5d4e4cc4baf08f4bacaf1eff12
+EBUILD util-linux-2.39_rc3.ebuild 10483 BLAKE2B cc53586a0f811ae4ace965cf8e485af584c290330a7630e0ccbc50a825d454c12be6ee5f055ecf828f5867e3e5a1f4ce1c336d75e5e8fbd33d3067bbfc061148 SHA512 42846b166641bef95c03ecd827ea77a61daab3579435611e03d7b855b36697b033c7a40402c4c07f93d10e119cd55d1caa4bfa5d4e4cc4baf08f4bacaf1eff12
 EBUILD util-linux-9999.ebuild 10483 BLAKE2B cc53586a0f811ae4ace965cf8e485af584c290330a7630e0ccbc50a825d454c12be6ee5f055ecf828f5867e3e5a1f4ce1c336d75e5e8fbd33d3067bbfc061148 SHA512 42846b166641bef95c03ecd827ea77a61daab3579435611e03d7b855b36697b033c7a40402c4c07f93d10e119cd55d1caa4bfa5d4e4cc4baf08f4bacaf1eff12
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.39_rc3.ebuild b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
new file mode 100644
index 000000000000..0baf9332ec6f
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.39_rc3.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+	inherit autotools git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+	inherit verify-sig
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	fi
+
+	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
+	hardlink? ( dev-libs/libpcre2:= )
+	ncurses? (
+		sys-libs/ncurses:=[unicode(+)?]
+		magic? ( sys-apps/file:0= )
+	)
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rtas? ( sys-libs/librtas )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+	acct-group/root
+"
+RDEPEND+="
+	hardlink? ( !app-arch/hardlink )
+	logger? ( !>=app-admin/sysklogd-2.0[logger] )
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	su? (
+		!<sys-apps/shadow-4.7-r2
+		!>=sys-apps/shadow-4.7-r2[su]
+	)
+	!net-wireless/rfkill
+"
+
+if [[ ${PV} == 9999 ]] ; then
+	# Required for man-page generation
+	BDEPEND+=" dev-ruby/asciidoctor"
+else
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+	if use su && ! use suid ; then
+		elog "su will be installed as suid despite USE=-suid (bug #832092)"
+		elog "To use su without suid, see e.g. Portage's suidctl feature."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+		return
+	fi
+
+	if use verify-sig ; then
+		mkdir "${T}"/verify-sig || die
+		pushd "${T}"/verify-sig &>/dev/null || die
+
+		# Upstream sign the decompressed .tar
+		# Let's do it separately in ${T} then cleanup to avoid external
+		# effects on normal unpack.
+		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
+		xz -d ${MY_P}.tar.xz || die
+		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
+
+		popd &>/dev/null || die
+		rm -r "${T}"/verify-sig || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# Prevent uuidd test failure due to socket path limit, bug #593304
+		sed -i \
+			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+		# Known-failing tests
+		# TODO: investigate these
+		local known_failing_tests=(
+			# Subtest 'options-maximum-size-8192' fails
+			hardlink/options
+
+			lsfd/mkfds-symlink
+			lsfd/mkfds-rw-character-device
+		)
+
+		local known_failing_test
+		for known_failing_test in "${known_failing_tests[@]}" ; do
+			einfo "Removing known-failing test: ${known_failing_test}"
+			rm tests/ts/${known_failing_test} || die
+		done
+
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+python_configure() {
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
+	)
+
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. bug #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+
+	# bug #485486
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
+	# bug #545042
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
+
+	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
+	# bug #601530
+	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
+	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
+
+	# Avoid automagic dependency on ppc*
+	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
+
+	# configure args shared by python and non-python builds
+	local commonargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+	)
+
+	local myeconfargs=(
+		"${commonargs[@]}"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with ncurses tinfo)
+		$(use_with selinux)
+	)
+
+	if multilib_is_native_abi ; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-newgrp
+			--disable-nologin
+			--disable-pylibmount
+			--disable-raw
+			--disable-vipw
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable hardlink)
+			$(use_enable kill)
+			$(use_enable logger)
+			$(use_enable ncurses pg)
+			$(use_enable su)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_with cryptsetup)
+		)
+		if [[ ${PV} == *9999 ]] ; then
+			myeconfargs+=( --enable-asciidoc )
+		else
+			# Upstream is shipping pre-generated man-pages for releases
+			myeconfargs+=( --disable-asciidoc )
+		fi
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-asciidoc
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+			--enable-libmount
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_configure
+	fi
+}
+
+src_configure() {
+	append-lfs-flags
+	multilib-minimal_src_configure
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python ; then
+		python_foreach_impl python_install
+	fi
+
+	# This needs to be called AFTER python_install call, bug #689190
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		# Need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didn't install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if use pam ; then
+		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+
+		newpamd "${FILESDIR}/su-l.pamd" su-l
+	fi
+
+	if use su && ! use suid ; then
+		# Always force suid su, even when USE=-suid, as su is useless
+		# for the overwhelming-majority case without suid.
+		# Users who wish to truly have a no-suid su can strip it out
+		# via e.g. Portage's suidctl or some other hook.
+		# See bug #832092
+		fperms u+s /bin/su
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+
+	local ver=$(tools/git-version-gen .tarballversion)
+	local major=$(ver_cut 1 ${ver})
+	local minor=$(ver_cut 2 ${ver})
+	local release=$(ver_cut 3 ${ver})
+	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
+}
+
+pkg_postinst() {
+	if ! use tty-helpers ; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.26.2.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.26.2.ebuild
deleted file mode 100644
index 5e3970ddaa02..000000000000
--- a/sys-auth/AusweisApp2/AusweisApp2-1.26.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Official authentication app for German ID cards and residence permits"
-HOMEPAGE="https://www.ausweisapp.bund.de/"
-SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="EUPL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5[qml]
-	dev-qt/qtwidgets:5
-	net-libs/http-parser:0=
-	sys-apps/pcsc-lite
-	virtual/udev"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DQt=Qt5
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild
index e5e3ddda4634..5e3970ddaa02 100644
--- a/sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.26.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="EUPL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index 97c29e97f478..2c67168b7b00 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,6 +1,4 @@
-DIST AusweisApp2-1.26.2.tar.gz 11491524 BLAKE2B dc73b9e62d3b50c5a904303f61a6ce6bfce6ab8795f0989a943c238e889f8d60bd27db2a403cf98aada4875253a58a5de46be415c0da0e201b292aca102a675d SHA512 8a133ad64ff7910852069b70250abb476fbb4a9f68f08efb9c5fb882bfa3328671e81b185a3ea7d3b936694057bc31cedaeb99cdfe07e3da79ea0474607b1273
 DIST AusweisApp2-1.26.3.tar.gz 10842706 BLAKE2B b18fdc67a24cca5be866ce3f2d59133732a8086d3f5711ac81783e66010e1590e9e06106ff60b6fb20910060610e483a924169e67f51feb2c82ec876761e7a2e SHA512 67fb6653a15df0c6182953e5bad19513d29b1ca90699e4f32145ded7f2a157ef2f0e98f00392548ba680fc9b08a95c6b4a9d6bd23fed6f1a000a2ac1de4ff52b
-EBUILD AusweisApp2-1.26.2.ebuild 944 BLAKE2B 1fee7734742fc405b969f83fd3243faa77f460b978b90ccafc8583fad32830ff39fa29bb41b828526bc30a19229528cf136d5dcce3cd61115e3adb4d3e3713e8 SHA512 1a3357be96c1e0afd45b70b8d1b1f2f94b11f407055e00b39170c9c5d6450ed8e25df231c6d775f0a141da9964d84fe00ff667c18096f75c4ff21c2284616b3f
-EBUILD AusweisApp2-1.26.3.ebuild 946 BLAKE2B 02b7fe0cebec48ce0c0e736ae59dc4d4d2c149cc098a69447a90da4014c691ed23beacd14de6327fe1bcdf444253f40bfd2d067ac3898745bb6322298cf2f205 SHA512 66edcb74985f2c47de23d56f5a353488a2d393ba6c1df80cd54f1a2d321ab54f12ec7f1f5504b380ad627812c273209268bcd32df0c31f0438a4df6235e83216
+EBUILD AusweisApp2-1.26.3.ebuild 944 BLAKE2B 1fee7734742fc405b969f83fd3243faa77f460b978b90ccafc8583fad32830ff39fa29bb41b828526bc30a19229528cf136d5dcce3cd61115e3adb4d3e3713e8 SHA512 1a3357be96c1e0afd45b70b8d1b1f2f94b11f407055e00b39170c9c5d6450ed8e25df231c6d775f0a141da9964d84fe00ff667c18096f75c4ff21c2284616b3f
 EBUILD AusweisApp2-9999.ebuild 896 BLAKE2B a283585d7f09d304017e9f80f3e081fa96787d702e919aa9f9bcd229078b6d17a9eb3dfeb8782f8011530a6cd8a3ab72be12c88251d4675c1924dea66a77672c SHA512 f361e420657a46e8234517d204548fb69b14bc367be38aa1f85b411bdcd53fdb6dc7a6b3807cf22376f82abc076181965d633b50e4b01a5a7a1032bbf45c0165
 MISC metadata.xml 338 BLAKE2B cc2c3169dbe9280f8ab769c2c2c38a691d0af53999169948243cca1200c2a6ef8bb2f97dcc0e8dcbd709f3660fa262bf5279d3acce525baefe91951f91f1eca7 SHA512 db2026e39095afa71c7431290d8032fb6cdf70138beb14ae5cc20f4c5d03a0fa334cd769c14fe1085520b8631947c35c654bbd686ccc2e60a308d19ef6eb9e83
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 75340c864e2c..a964044eaf36 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index 5189ce67b094..c37aab54d468 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -1,6 +1,4 @@
-DIST skey-1.1.5-patches-6.tar.xz 34108 BLAKE2B 410dbe673e0a32a4c3fd0610f898057e7b3afcc0d0fd124683033790f9c518bf89486f13e8d87825c0959ff34e91eae82df6ba3b79c1dcb99a34d5657036d5a6 SHA512 2c807675cdd6b800f03427d79d616f59ac9d4d438221913328ec92e5dd13af185f74a24e17d36af8d49a51c4ecc5b24ef198489acce416d829e8aacf5d3c208a
 DIST skey-1.1.5-patches-7.tar.xz 34412 BLAKE2B 77c37b71e80a629dc24996a496ac870d8ad431268bc8eff188ffe09fda6c52b4169aae6e16d31897658e003c1565176f5b8bdd7052795b372c47e49258a7d8ff SHA512 a73f0772883cfb8a6cd7acabd0d005e723952c4eb3b83d27b5c321737e38a4b4b65be0e7cb1b4fb5d040e315b3c36f6f4ca96f20ad8564617e694e9373fa060d
 DIST skey-1.1.5.tar.bz2 61911 BLAKE2B 6226a91f4018bee5796bf60339dc8554324a044eef18a69ea176d060cb4af90779cafaee58f42ad7a6e433b94da8de6e5e4d1ee9362904966fd0872d5ac3ccce SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37
-EBUILD skey-1.1.5-r13.ebuild 2139 BLAKE2B d890b62b8d5945078969b4e1e251792df7ed00a17f7a139421cf68c5aa0c9871ed3cf28774477237d7cc97338078a1dd8d5a7995ec62403798a6455472888be0 SHA512 63cbbbc3284077094e2e10a6a695d6ff4dd969879f3b5fb803316a279c6c329455ab62684ddbb38bc2e373667ee3eda1481161eb0e64f4f33b6d5285679e1cd7
-EBUILD skey-1.1.5-r14.ebuild 2146 BLAKE2B aea8aa6ba4f2815058303ff8d2af0b8eacdb693e4f65ec07dc0b6651140597e0e05d5e6f4f806b91f06ae93d70c27d78ed9d03efe8d86b8ea68855575e550bce SHA512 6d3f0f1f24998b79404e7b2494357f28670f918fcf2881a5e3b76f32fb270bd2d22c5fe1f8ef6aa12eb318e2eaacd207d497e04b4994d5cc8ffbae5a65531f2f
+EBUILD skey-1.1.5-r14.ebuild 2139 BLAKE2B 5a879bd56dbc1c230e9f12e27e9ad3502a7ab21934367424b1617b4e968d21380a6a9798c595a79a752be7cfcd6576277007fff93ba5e20c82c25aa227494137 SHA512 1dae9a31a0212e588418904c641317fa2969a158cae2e68b56f1a9c1e187145a9e964cecdf3dab98ed1c06dbcfec16fb296436fe9bef27831c3cf7ba8e3cda9b
 MISC metadata.xml 1433 BLAKE2B fd0468c647d2f1bf32f3de9c475ab7249abb0ff644b0eefa1e8d549388ccd816317f7e69788c7f8566094521b8716c3660a5edb2ff7177b82f7f54fecff09c91 SHA512 9823479c4d2213a47660f4d7119adcccc104d07144a4981f7f3a80260a14a3535d3dfe952ead65fd2ecd84cde45709006dee4e7d41cb6d5993ba3f25e0de3d4d
diff --git a/sys-auth/skey/skey-1.1.5-r13.ebuild b/sys-auth/skey/skey-1.1.5-r13.ebuild
deleted file mode 100644
index ffd30c0f335d..000000000000
--- a/sys-auth/skey/skey-1.1.5-r13.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools readme.gentoo-r1 toolchain-funcs usr-ldscript
-
-DESCRIPTION="Linux Port of OpenBSD Single-key Password System"
-HOMEPAGE="https://web.archive.org/web/20160710152027/http://www.openbsd.org:80/faq/faq8.html#SKey"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-6.tar.xz"
-
-LICENSE="BSD MIT RSA BEER-WARE"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="dev-lang/perl
-	sys-libs/cracklib
-	virtual/libcrypt:="
-
-RDEPEND="${DEPEND}
-	virtual/perl-Time-Local"
-
-BDEPEND="app-arch/xz-utils"
-
-PATCHES=("${WORKDIR}/patch")
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf --sysconfdir=/etc/skey
-}
-
-src_install() {
-	into /
-	dolib.so libskey.so{.${PV},.${PV%.*},.${PV%%.*},}
-
-	into /usr
-	dobin skey skeyinit skeyinfo
-	newbin skeyaudit.sh skeyaudit
-	newsbin skeyprune.pl skeyprune
-
-	dosym skey /usr/bin/otp-md4
-	dosym skey /usr/bin/otp-md5
-	dosym skey /usr/bin/otp-sha1
-
-	if use static-libs; then
-		dolib.a libskey.a
-		gen_usr_ldscript libskey.so
-	fi
-
-	doman skey.1 skeyaudit.1 skeyinfo.1 skeyinit.1 skey.3 skeyprune.8
-
-	insinto /usr/include
-	doins skey.h
-
-	keepdir /etc/skey
-
-	# only root needs to have access to these files.
-	fperms go-rx /etc/skey
-
-	# skeyinit and skeyinfo must be suid root so users
-	# can generate their passwords.
-	fperms u+s,go-r /usr/bin/skeyinit /usr/bin/skeyinfo
-
-	dodoc README CHANGES
-
-	local DOC_CONTENTS="For an introduction into using s/key authentication,
-		take a look at the EXAMPLES section from the skey(1) manpage."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	# do not include /etc/skey/skeykeys in the package, as quickpkg
-	# may package sensitive information.
-	# This also fixes the etc-update issue with #64974.
-
-	# skeyinit will not function if this file is not present.
-	touch /etc/skey/skeykeys
-
-	# these permissions are applied by the skey system if missing.
-	chmod 0600 /etc/skey/skeykeys
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-auth/skey/skey-1.1.5-r14.ebuild b/sys-auth/skey/skey-1.1.5-r14.ebuild
index b003516a9db7..813f7155f171 100644
--- a/sys-auth/skey/skey-1.1.5-r14.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="BSD MIT RSA BEER-WARE"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="dev-lang/perl
diff --git a/sys-auth/ssh-import-id/Manifest b/sys-auth/ssh-import-id/Manifest
index 7b075d06b42d..823297ec861c 100644
--- a/sys-auth/ssh-import-id/Manifest
+++ b/sys-auth/ssh-import-id/Manifest
@@ -1,4 +1,4 @@
 DIST ssh-import-id-5.11.tar.gz 146064 BLAKE2B d869ec480d224aa906ef08b5b9acfbf9324d67bffafadcf1c0adae108ad53e76cdfbcf0d1905a947bda5df507fbd69e7ee121890bc48e452ca67c5acd92ac18c SHA512 49703b8b9c127f13bf0626fd013318b9498ec8a67a060fb7607c7a1894da3e3e3e7e995c9b68af8375237f4031d06abda20f2a9a73a1fabbe33055f2f434716b
-EBUILD ssh-import-id-5.11-r1.ebuild 681 BLAKE2B 59126b8e58d56ddc2fecfa64dc8747f29fa36b3b54fbdd4295f329a5aa1e6878b5fc6a79777c06b482761e935d6b7207a5a59222b6a0665ec56e679f397ee857 SHA512 32adf6275135c540fc3614e8f4deb1b353074269d925e43f9c9825e1ef9b1236612b4fe96b25fd818efe653e4bcb793310bf39cd256cbc1165c3959bed7f249f
+EBUILD ssh-import-id-5.11-r1.ebuild 675 BLAKE2B 1ace0dcf0c5f7fc95079db4b968e4867ea0c6a7c6094e71a702fb2577ffee332c196f475dd3cff258c4a8b297b28c62b663267bbded2600f70a2f0ba4679e9a9 SHA512 f4590f1ef081d9a327a3ac9eb080475e008bb3a80ce4bfb3d28d2c0a46355b6b56971b30e7a9bd895e1b7b07e82be277de773810d636fd6a364621c8d0cb8a17
 EBUILD ssh-import-id-5.11.ebuild 643 BLAKE2B 79487010604b3b453f626b2048fb5c8f49c28f1a7cb88b68f10ce969a285a028d9eae70d6bb74f7ae2ecfe0abeee98cc5c23b5a9d73995bab1b17e5f2fb86358 SHA512 32d64e6d17a6a46b0fe588d83805b5172fda014e5f62f92a1f7444df752aa1ed0723e9d350fffcfe66738c7b19cb5acee7a9fe9ea0173037ce5790966ad2a59f
 MISC metadata.xml 358 BLAKE2B 91acc78cd37661bd253369897590130c448d89cdcfd324c3aa4e8f669540d742a3de9602642b1ce048e09ab7b1c7595e88186ea15ade1863dfce8dd22a9d9fcb SHA512 ad8fb377a3fc91116c3c64440d3bda1f7f9cd13d898544efa314b57e9ede5d54f566c7efbbbcae39fc37d07323f2c17163d9ec1532b968c5ce2b14a581ebd3d4
diff --git a/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
index 5e367ecf4375..ddde94c6da84 100644
--- a/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
+++ b/sys-auth/ssh-import-id/ssh-import-id-5.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index f513f60f545d..552ff2dadfa5 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 7cebbb727ccf..f53a4772dc7f 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
 EBUILD clang-common-15.0.7-r5.ebuild 5090 BLAKE2B 39974630209630607d10903585223df68cd809fb390fc9eb2a80c4235ce70ae21120083f8eaf749c769a93f738c4e971e31e978dd637a0b87d07260281db4b83 SHA512 6cb37a7eb373d300d165e851e3643fd35e11d78a6a88617b4a8c0063b83558d10d307c32861e9ba2d0ac902c1cd2069ece6bd1446e309a6753f13adf8cd8fa2c
 EBUILD clang-common-16.0.1.ebuild 5158 BLAKE2B 96869b1c5b4872174e17980aa070c364675a1c3a8b0560af17e6e7530f35b8fd97a8735d3947abc75e8cc245015e585ce44b3e1d9fa418a2a4787cd1f08ef1c9 SHA512 0507f8d775a17b4272e80ee6413df400f1ecbbb0954b1cee0d0cbe97c8793ebf2a90e3ce6bbe7a0e7376b1fb4a0d30b6bdee31f1e1722d81d70cc3b79d4f14c7
-EBUILD clang-common-16.0.2.9999.ebuild 5067 BLAKE2B daae19bdc044695e3c2a7c6a16687011f499fdbb7a3c7c1dd62488ac17631ba06cc6d9e5f58aaca1c72bbdf3204d80c915094ed59d19a81320616f5f5426a35b SHA512 5a2336c686fe9d45bbc66014d8957f3b5fad926f0b7907b8665864b2932486defd9b2b53de9c0b661077d9efdbd830dd9bbbf388ab2e8f02311135e65c3ebc31
+EBUILD clang-common-16.0.2.ebuild 5158 BLAKE2B 96869b1c5b4872174e17980aa070c364675a1c3a8b0560af17e6e7530f35b8fd97a8735d3947abc75e8cc245015e585ce44b3e1d9fa418a2a4787cd1f08ef1c9 SHA512 0507f8d775a17b4272e80ee6413df400f1ecbbb0954b1cee0d0cbe97c8793ebf2a90e3ce6bbe7a0e7376b1fb4a0d30b6bdee31f1e1722d81d70cc3b79d4f14c7
+EBUILD clang-common-16.0.3.9999.ebuild 5067 BLAKE2B daae19bdc044695e3c2a7c6a16687011f499fdbb7a3c7c1dd62488ac17631ba06cc6d9e5f58aaca1c72bbdf3204d80c915094ed59d19a81320616f5f5426a35b SHA512 5a2336c686fe9d45bbc66014d8957f3b5fad926f0b7907b8665864b2932486defd9b2b53de9c0b661077d9efdbd830dd9bbbf388ab2e8f02311135e65c3ebc31
 EBUILD clang-common-17.0.0.9999.ebuild 5067 BLAKE2B daae19bdc044695e3c2a7c6a16687011f499fdbb7a3c7c1dd62488ac17631ba06cc6d9e5f58aaca1c72bbdf3204d80c915094ed59d19a81320616f5f5426a35b SHA512 5a2336c686fe9d45bbc66014d8957f3b5fad926f0b7907b8665864b2932486defd9b2b53de9c0b661077d9efdbd830dd9bbbf388ab2e8f02311135e65c3ebc31
 EBUILD clang-common-17.0.0_pre20230325.ebuild 5067 BLAKE2B daae19bdc044695e3c2a7c6a16687011f499fdbb7a3c7c1dd62488ac17631ba06cc6d9e5f58aaca1c72bbdf3204d80c915094ed59d19a81320616f5f5426a35b SHA512 5a2336c686fe9d45bbc66014d8957f3b5fad926f0b7907b8665864b2932486defd9b2b53de9c0b661077d9efdbd830dd9bbbf388ab2e8f02311135e65c3ebc31
 EBUILD clang-common-17.0.0_pre20230414.ebuild 5067 BLAKE2B daae19bdc044695e3c2a7c6a16687011f499fdbb7a3c7c1dd62488ac17631ba06cc6d9e5f58aaca1c72bbdf3204d80c915094ed59d19a81320616f5f5426a35b SHA512 5a2336c686fe9d45bbc66014d8957f3b5fad926f0b7907b8665864b2932486defd9b2b53de9c0b661077d9efdbd830dd9bbbf388ab2e8f02311135e65c3ebc31
diff --git a/sys-devel/clang-common/clang-common-16.0.2.ebuild b/sys-devel/clang-common/clang-common-16.0.2.ebuild
new file mode 100644
index 000000000000..4acd801b683d
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-16.0.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	default-compiler-rt default-libcxx default-lld llvm-libunwind
+	hardened stricter
+"
+
+PDEPEND="
+	sys-devel/clang:*
+	default-compiler-rt? (
+		sys-devel/clang-runtime[compiler-rt]
+		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
+		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+	)
+	!default-compiler-rt? ( sys-devel/gcc )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	!default-libcxx? ( sys-devel/gcc )
+	default-lld? ( sys-devel/lld )
+	!default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+	!default-compiler-rt? ( sys-devel/gcc-config )
+	!default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+	local flag missing_flags=()
+	for flag in default-{compiler-rt,libcxx,lld}; do
+		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
+			missing_flags+=( "${flag}" )
+		fi
+	done
+
+	if [[ ${missing_flags[@]} ]]; then
+		eerror "It seems that you have the following flags set on sys-devel/clang:"
+		eerror
+		eerror "  ${missing_flags[*]}"
+		eerror
+		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
+		eerror "The build is being aborted to prevent breakage.  Please either set"
+		eerror "the respective flags on this ebuild, e.g.:"
+		eerror
+		eerror "  sys-devel/clang-common ${missing_flags[*]}"
+		eerror
+		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
+	fi
+}
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+
+	insinto /etc/clang
+	newins - gentoo-runtimes.cfg <<-EOF
+		# This file is initially generated by sys-devel/clang-runtime.
+		# It is used to control the default runtimes using by clang.
+
+		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
+		--stdlib=$(usex default-libcxx libc++ libstdc++)
+		-fuse-ld=$(usex default-lld lld bfd)
+	EOF
+
+	newins - gentoo-gcc-install.cfg <<-EOF
+		# This file is maintained by gcc-config.
+		# It is used to specify the selected GCC installation.
+	EOF
+
+	newins - gentoo-common.cfg <<-EOF
+		# This file contains flags common to clang, clang++ and clang-cpp.
+		@gentoo-runtimes.cfg
+		@gentoo-gcc-install.cfg
+		@gentoo-hardened.cfg
+	EOF
+
+	# Baseline hardening (bug #851111)
+	newins - gentoo-hardened.cfg <<-EOF
+		# Some of these options are added unconditionally, regardless of
+		# USE=hardened, for parity with sys-devel/gcc.
+		-fstack-clash-protection
+		-fstack-protector-strong
+		-fPIE
+		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
+	EOF
+
+	dodir /usr/include/gentoo
+
+	local fortify_level=$(usex hardened 3 2)
+	# We have to do this because glibc's headers warn if F_S is set
+	# without optimization and that would at the very least be very noisy
+	# during builds and at worst trigger many -Werror builds.
+	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+	#ifdef __clang__
+	# pragma clang system_header
+	#endif
+	#ifndef _FORTIFY_SOURCE
+	# if defined(__has_feature)
+	#  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+	# else
+	#  define __GENTOO_HAS_FEATURE(x) 0
+	# endif
+	#
+	# if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
+	#  if !defined(__SANITIZE_ADDRESS__) && !__GENTOO_HAS_FEATURE(address_sanitizer) && !__GENTOO_HAS_FEATURE(memory_sanitizer)
+	#   define _FORTIFY_SOURCE ${fortify_level}
+	#  endif
+	# endif
+	# undef __GENTOO_HAS_FEATURE
+	#endif
+	EOF
+
+	if use hardened ; then
+		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+			# Options below are conditional on USE=hardened.
+			-D_GLIBCXX_ASSERTIONS
+
+			# Analogue to GLIBCXX_ASSERTIONS
+			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+			-D_LIBCPP_ENABLE_ASSERTIONS=1
+		EOF
+	fi
+
+	if use stricter; then
+		newins - gentoo-stricter.cfg <<-EOF
+			# This file increases the strictness of older clang versions
+			# to match the newest upstream version.
+
+			# clang-16 defaults
+			-Werror=implicit-function-declaration
+			-Werror=implicit-int
+			-Werror=incompatible-function-pointer-types
+
+			# constructs banned by C2x
+			-Werror=deprecated-non-prototype
+
+			# deprecated but large blast radius
+			#-Werror=strict-prototypes
+		EOF
+
+		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+			@gentoo-stricter.cfg
+		EOF
+	fi
+
+	local tool
+	for tool in clang{,++,-cpp}; do
+		newins - "${tool}.cfg" <<-EOF
+			# This configuration file is used by ${tool} driver.
+			@gentoo-common.cfg
+		EOF
+	done
+}
+
+pkg_preinst() {
+	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+	then
+		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+		if [[ -n ${gcc_path} ]]; then
+			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+				--gcc-install-dir="${gcc_path%%:*}"
+			EOF
+		fi
+	fi
+}
diff --git a/sys-devel/clang-common/clang-common-16.0.2.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.3.9999.ebuild
similarity index 100%
rename from sys-devel/clang-common/clang-common-16.0.2.9999.ebuild
rename to sys-devel/clang-common/clang-common-16.0.3.9999.ebuild
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 8c0319f42873..3f1ff0088ce0 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,7 +1,8 @@
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
 EBUILD clang-runtime-15.0.7.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f
 EBUILD clang-runtime-16.0.1.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
-EBUILD clang-runtime-16.0.2.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
+EBUILD clang-runtime-16.0.2.ebuild 1442 BLAKE2B ccd97064b84899371758ceab7640d2b9a3104e08dccbefc5523062437cec1358ab68773b96bbc8193d8cd52a2bac65e6687cb150127d953aa49ab7f8cb3dbcea SHA512 9b8639788a2bfab9fea6e717e684c4784ae6719ce8d6bb389d16d836df0b43d108be6c649b9aa17dfa60df7b3f490450d4d51e83dd80707467a844871b97535e
+EBUILD clang-runtime-16.0.3.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0.9999.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0_pre20230325.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
 EBUILD clang-runtime-17.0.0_pre20230414.ebuild 1369 BLAKE2B f69af454137c9689bebc710a7a6988338bc715c68238367d55b5f01859244954b7ff8719ba285b64e76a578f063ab3f6325d5e9519ef5ebdb31592af1a276225 SHA512 436ecac7bb5ba46ca72ab48ea2bd8e30e2ee180218c0c3f14f41abd4e3b0445655ad033058bb78661b2095c5786ef644b538574d4ae2a9a8ee12fefc179f79db
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.2.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.2.ebuild
new file mode 100644
index 000000000000..6483c7c0c78e
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-16.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
+
+pkg_pretend() {
+	if tc-is-clang; then
+		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
+		ewarn "upstream has turned a few warnings that commonly occur during"
+		ewarn "configure script runs into errors by default.  This causes some"
+		ewarn "configure tests to start failing, sometimes resulting in silent"
+		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
+		ewarn "not yet clear whether the change will remain or be reverted."
+		ewarn
+		ewarn "For more information, please see:"
+		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
+	fi
+}
diff --git a/sys-devel/clang-runtime/clang-runtime-16.0.2.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-16.0.3.9999.ebuild
similarity index 100%
rename from sys-devel/clang-runtime/clang-runtime-16.0.2.9999.ebuild
rename to sys-devel/clang-runtime/clang-runtime-16.0.3.9999.ebuild
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index db1437065334..2e781656a7d3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,6 +1,7 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-16.0.1-manpages.tar.bz2 243292 BLAKE2B febf892d91f16f1b320083563ebecd0632e26823e316c62d608f4445979423c597534e75191522202168d76e7aa355bbccff0378e0152e7a0ac14cb95ba7baaf SHA512 0183a421167d8d20bd60306a43d3c4069f87e73615102a7430c2a4bd057c96e7941c91b8d92cfe7b29f2691d517c4a5406052a3a818fcaf1356e0392397c1676
+DIST llvm-16.0.2-manpages.tar.bz2 245800 BLAKE2B f9672c11710d48d36f2a3508b6473746ad02223eeb9aa282929e2b7b8b89bf76d3c121c1df0ac78c66040b632e4090dad8e2baaf1d9862495eb991b1baa3f9ad SHA512 11183cc818500d7805831c79f77b279af27435304c3464d8f74b1f9dda915365e09d699d221e43f98f8bad8a14498d4a471dc13f9c3afe6d0eaaf7f59661a9fe
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz 181527027 BLAKE2B f2f3b3a33b2a50f3b4f97df16a948e5ed5e642f737de8e852da164aefd3ed9af7bbd0fc1de9f7c9dbee6b9b8ebe11e52af8cc79b8a130cff405fc1238afe217d SHA512 946cd1435a26673c851bdda170864d0c362dfc14d1a7087fbe6303ac79e1821e9c53b72e92d15ad7180b1d6ea3bcc0458e7bec37acc3e8b8bcca8efbb9ff2387
@@ -10,11 +11,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD clang-14.0.6-r1.ebuild 12014 BLAKE2B 0f9eed7779a5b9aa8f92002f6f4d8e22e7baf3d3f6d1930e4716abf3aa00d866f68a682dc2a404655f53800e26c8b388da552184da6943287b2d91c5c1c2672b SHA512 c5e46f1044604f4e41cdb6c42d2079096c0bcdd396d99f8e95a6b5b66918e3519e4226741202f716fa5f53295188ec2bfcec66ae32480a8e10b4ab18bdb880ab
 EBUILD clang-15.0.7-r1.ebuild 12617 BLAKE2B 780db8dc3c92efab35280d32f6b7d4ffcea912d7839b995a18aa603d0cf59df1199eabd53eb5a475e67da7a45e10fdd08e9879b871a25672f135dbdb001a5f46 SHA512 f6302415c9a4fb8571613ff5ebea4096f1318333ba4bc0f3c0b63b04eb0d10755c4555f55186875db0d34bb5d2c0b245b758aff387b97033bc643a1a291d1195
 EBUILD clang-16.0.1.ebuild 12418 BLAKE2B 57dfd115224aa564222e44debc492053f9e8f557f035d3d673b025f5108ec335c9671392979c543e3d6400b5c0bad3a673e71b1972f287f969fb7190f96db006 SHA512 ba3aa9433fd6b65cc32b84c586fdbc87107b5ec61863ce15ba8fe7446b981547a34be3316955aa30780af29a1d1b53bcb6567cf7dacb4b95b2f985843d6266e4
-EBUILD clang-16.0.2.9999.ebuild 12338 BLAKE2B 9f1989ffd52f28006e256a97836ac9623b3efff14516d05dc4c3cd69c97bd5955abc97142ed4b2099283ff2364ee7e4a32bf33282faf700643fee63e7bfc9be7 SHA512 e93e8f87344051c093d28b53fe0184444a2f34d05a1c95257c361ac097687d225cf9d6df218093887cdc07e23490f77a2399ed1e075c582aaa9710504687d31b
+EBUILD clang-16.0.2.ebuild 12442 BLAKE2B 768d62dbfa26da9aa52240132b767c00f27e905bddbbd5078b507330d06c7033c7f2db06a199c74e20f8a83fcbacb94ec401ff4a7e81256a6a33f7774eaa8209 SHA512 e413717bd5191a054822daa2b8f3bc363b58de267e66046b3908edd8da6714552e039bb23e9d4c613a8e535c2d70e7add72a923f82763365dab00b5252a04be5
+EBUILD clang-16.0.3.9999.ebuild 12362 BLAKE2B 0cefbe01e7f0301a5c7ab7cb1ec3592806c0fcc45b574c81aaa9154295bfa0781b16058b7e3e2f46279500a468c12e9d0ed3a7804881f51dda0cb380a67f49a8 SHA512 4cc4d69017452e14b7224d9ae8762659d6ab52c972bb7ef944817888a21f7875f6f7010b12f970691015b048559b004c830b9414b12a4b47883130f73a0a0438
 EBUILD clang-17.0.0.9999.ebuild 12352 BLAKE2B b2eb7a2fe9222bfe3b857844f65dc217b16a677e434efb70c8f576a154f95d4e47e55973d4954ae0924338a8d0cfc5453e9c163928bb297686926d2a13222933 SHA512 d1bb9920da99b036e2c1bf3dbd1c3f71249be6dc7e0a24c1c27acbfbca766c0bec4e1cae8e2f5aa0148ed1eefeb14202f97f80a9d508b772d781f37e5dd7380a
 EBUILD clang-17.0.0_pre20230325.ebuild 12338 BLAKE2B 869e9d4f63fa9a0dbd7b23ffea1f09060b1cf579d6d9c9a3f707f697bdfa20ba76f8da9b34986077fdcfb6877b04c3a03664592e612874b2991c69230fe5f7c7 SHA512 23fa3774f4fa649b1b927c700507ba29f3b41ab4f4385b9e4685648815f9f761c5a16864f37e5f809389c43456ac39db1f6b9a1d7dcbb9e2a7b226d16b824bd5
 EBUILD clang-17.0.0_pre20230414.ebuild 12352 BLAKE2B b2eb7a2fe9222bfe3b857844f65dc217b16a677e434efb70c8f576a154f95d4e47e55973d4954ae0924338a8d0cfc5453e9c163928bb297686926d2a13222933 SHA512 d1bb9920da99b036e2c1bf3dbd1c3f71249be6dc7e0a24c1c27acbfbca766c0bec4e1cae8e2f5aa0148ed1eefeb14202f97f80a9d508b772d781f37e5dd7380a
diff --git a/sys-devel/clang/clang-16.0.2.ebuild b/sys-devel/clang/clang-16.0.2.ebuild
new file mode 100644
index 000000000000..4ff97760cff7
--- /dev/null
+++ b/sys-devel/clang/clang-16.0.2.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+	>=sys-devel/clang-common-${PV}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	~sys-devel/clang-runtime-${PV}
+	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=1
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing
+	llvm/utils
+	third-party
+)
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+
+	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
+		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		aarch64-resource-headers
+		arm-common-resource-headers
+		arm-resource-headers
+		core-resource-headers
+		cuda-resource-headers
+		hexagon-resource-headers
+		hip-resource-headers
+		hlsl-resource-headers
+		mips-resource-headers
+		opencl-resource-headers
+		openmp-resource-headers
+		ppc-htm-resource-headers
+		ppc-resource-headers
+		riscv-resource-headers
+		systemz-resource-headers
+		utility-resource-headers
+		ve-resource-headers
+		webassembly-resource-headers
+		windows-resource-headers
+		x86-resource-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			amdgpu-arch
+			c-index-test
+			clang
+			clang-format
+			clang-linker-wrapper
+			clang-offload-bundler
+			clang-offload-packager
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+			nvptx-arch
+
+			# needed for cross-compiling Clang
+			clang-tblgen
+		)
+
+		if use extra; then
+			out+=(
+				# extra tools
+				clang-apply-replacements
+				clang-change-namespace
+				clang-doc
+				clang-include-cleaner
+				clang-include-fixer
+				clang-move
+				clang-pseudo
+				clang-query
+				clang-reorder-fields
+				clang-tidy
+				clang-tidy-headers
+				clangd
+				find-all-symbols
+				modularize
+				pp-trace
+			)
+		fi
+
+		if llvm_are_manpages_built; then
+			out+=( docs-clang-man )
+			use extra && out+=( docs-clang-tools-man )
+		fi
+
+		if use doc; then
+			out+=( docs-clang-html )
+			use extra && out+=( docs-clang-tools-html )
+		fi
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local mycmakeargs=(
+		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+		-DCLANG_INCLUDE_TESTS=$(usex test)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+		# disable linking to HSA to avoid automagic dep,
+		# load it dynamically instead
+		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
+
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if ! use elibc_musl; then
+		mycmakeargs+=(
+			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
+		)
+	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+			if use extra; then
+				mycmakeargs+=(
+					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				)
+			fi
+		fi
+		mycmakeargs+=(
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+		)
+	fi
+	if multilib_native_use extra; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
+			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
+		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
+		mycmakeargs+=(
+			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
+			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check-clang )
+	if multilib_native_use extra; then
+		test_targets+=(
+			check-clang-tools
+			check-clangd
+		)
+	fi
+	cmake_build "${test_targets[@]}"
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	if use extra; then
+		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	fi
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
+		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
+		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
+			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
+				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_native_use extra; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
+	if use extra; then
+		elog "Some of them are vim integration scripts (with instructions inside)."
+		elog "The run-clang-tidy.py script requires the following additional package:"
+		elog "  dev-python/pyyaml"
+	fi
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/clang/clang-16.0.2.9999.ebuild b/sys-devel/clang/clang-16.0.3.9999.ebuild
similarity index 99%
rename from sys-devel/clang/clang-16.0.2.9999.ebuild
rename to sys-devel/clang/clang-16.0.3.9999.ebuild
index 4c59778e088a..319b5960722a 100644
--- a/sys-devel/clang/clang-16.0.2.9999.ebuild
+++ b/sys-devel/clang/clang-16.0.3.9999.ebuild
@@ -195,6 +195,7 @@ get_distribution_components() {
 			c-index-test
 			clang
 			clang-format
+			clang-linker-wrapper
 			clang-offload-bundler
 			clang-offload-packager
 			clang-refactor
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ecd4f5db20b4..822751c14fe8 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
 DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4 SHA512 97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
 DIST gcc-10-20230413.tar.xz 72123372 BLAKE2B fe2c92692eedd66b9a6ed6af0c9102e4bcf996bfb20b5e1bf6ab2aaaa5662dbe81d1a5a18cce2cc7dbc4e6b4b599c59ea1a9e46586a36439d5047584a876e924 SHA512 c0fdb0a083b833ed24b85f744a18b1071bcf76de620ea7eb7b20b6b59f6489596c8e6cbd4c39d7f87119421f345a788a285f7aac47eab5f01ffb3aefc1d36dba
+DIST gcc-10-20230419.tar.xz 72143336 BLAKE2B ffe2c39a0e99900d0c147908b3e2ebefff24460ec77b4835ae8ecd21bdc7e5b45865dbca16ff92e5ec7df6d0fa6c7629a77e2cf7d4113696bb6b25e42f6e24d8 SHA512 d1465b4b2f5c5d80c9d8fd6c4843246dea40c0d71925de47cdcb4ba2c426457dca876fefe7a2e46bd8bd933d28203aaab65dac12a981a2451716ff24584a40e8
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
 DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31
@@ -22,6 +23,7 @@ DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f
 DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badbff3f802e6a0422478206b5cdda76e70b531a474d2ac42817e9e7f8200e9ac35ca8276af539839b4ebb2e22903ec25a23 SHA512 2970de9d2806d59c5d0f77e66000860c816ebd674489db8114f48f6aa11575644154431480222580b520b9e312647b06f94ab38959a49a8cda818158d6babf1d
 DIST gcc-12.2.0-patches-14.tar.xz 13752 BLAKE2B c44609a8a3a96480f144b7e6859c2b1d7105f421ffa08929c35fc13eb5ec11d967b02cf8248ecb4ea85824b1872125a73c92f404050c3399d5c06fe668711fd3 SHA512 c1db7a7f3a929dfdc8de9a662448f57296ab818b9fd133763b2ab0dddce2e01cf322e5ac53f3d69c2366053ef3c4fa44c72eed248dc7aeef49f558341bdd3854
 DIST gcc-13-20230416.tar.xz 83936936 BLAKE2B c052fff2838a0bdd87f90345a5f7f5c607a6fe360b02ce8cb076f6dd3a62f6aae0c7d3914eee447e9c92c971331ddcbf0c94f2aa120aef89a742162b5e7dbfdd SHA512 222bb6db05b23aeb428262c69319a4964097065a88a5ae6c19b104c31af82c465f139c08f01bb077b0e776685769b77a54b772ebc4e2057e7c3e8954283997cf
+DIST gcc-13.1.0-RC2-20230419.tar.xz 87499876 BLAKE2B c105278da9f6a2b22407eae8871169f778cffbc1ac6f94c2804da42b8251dd795fce97fe2856934b78de5f21522a79edd7295a0b3c12755cdc28e918f897e76d SHA512 7bb1a0d284ac26f84ae522e8024871056ef037d2e9be625606e3e6834620e81555f3f4ea066375a46ad2149286f3b19cfbeddede4a80e90ede2a59bbcdcaf1df
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba SHA512 98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
@@ -31,6 +33,7 @@ DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f7
 EBUILD gcc-10.4.1_p20230119-r1.ebuild 1445 BLAKE2B 3ec47f604ac04dc3b07b02b56a912d5ca1971460b72f2adfdf3992c6d17182e7be9c7a11f047a59be29ead76b8c543d873e6c68cfd6cdea8fa6c0279f58c767d SHA512 3ec35f5053c21c1c6debc11a5b654bd5ec6c04f8bb72dd3dede77c4fab9d0734a0b866aba34d2286ef7b7ff1efa06189c7a6f79c8a57ce734c932fa6f1367b15
 EBUILD gcc-10.4.1_p20230302.ebuild 1453 BLAKE2B fe070759433bfc4d214d0d14eb8998d78830420b5008d5dd7a4dc2acb5db1f3ce549a3558b884fb474831eff097ad4a0c8f7366730bda54c9ffefcc0772fbcee SHA512 2f4e1da8d8aacb17cab60fc1d215e06d72968dadb81808e9cbe2d2e80c7a0e5ef426e6bfb6d847898d7dede47dc6a715c299bf6dbca24e93bb4574437c88a632
 EBUILD gcc-10.4.1_p20230413.ebuild 1456 BLAKE2B 44855d5d880bb6391a140d4212b9c92c3a0e056622380e830104aaa2146d6c1fce51690c526b1e45a7a94833c2efef6de3781567cbf0e4c1182e9de28a9bd853 SHA512 0bf4a44a5cc89f6f04ed129a24dc8b9fed0c4211fee0ff2e9e343b04e71432b053acd022374dae96096cbd65c5e9f05f7b65919a6597c85b0295f5aa1b01903e
+EBUILD gcc-10.4.1_p20230419.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 1334 BLAKE2B ff7ec5997af15e5cc40d4834d779512c6319387f7d9b8905323db1b8d68f70e8a717817265d431ea37e259d506eeb0966472c7c4341eb76e5a1f25c4d7df9f2d SHA512 10054ca3c00ca54ec905a7d087d5d99a7db43af9bad0bff1ea1dc547e0ac899e5cddaa939a8ed4b38aad4eb109cc88fa71a6b05ea2c72a982774abb4350ecf1c
@@ -43,6 +46,7 @@ EBUILD gcc-12.2.1_p20230415.ebuild 1486 BLAKE2B dad7755246a60881d0ca2df86aca1a56
 EBUILD gcc-12.3.9999.ebuild 1593 BLAKE2B 0cac4b67933abbacf0037f3e89b4209ea2a8147b62d4c2b6e61701711ee421d240899c4c9bdb201cdfceef14125227109b4c5c3524256a06b206887a4d0f142e SHA512 ac75c2434ba6a36655749ed371b158360a7e05570ed41e39dac0a15ac6eb24810f2408a2d30e50206e4250c567123377e14317c07ab1e6b5771599a3b5e0ced0
 EBUILD gcc-13.0.1.9999.ebuild 1327 BLAKE2B ec9652e60d12944e328922bfbd8873ab2258e7f194c1d4aa5da5e8e7e090aca6d8e17d33e2b6b7397ad30e669c3ff072260a9de12a398b8ff7cc7ce533ca2f9a SHA512 62066f20c7861c90e567268fc327d4b8f59043e63df6bb4831e6e2538f91113ffb075eb1be13a8fc3a67a26c79681e06b84f2a9405286f99fc59eee3cea46222
 EBUILD gcc-13.0.1_pre20230416.ebuild 1354 BLAKE2B b1dcf92771940c65b4862f76107df49bdc811c279fa33205cc63d8ed74ceed786712e42a7c050e691a30494b3b55c7bcf62e14d7baa2550c392b7d0bac0007d0 SHA512 4e49f8ea0487bd4cf57a2518647e1dc1f82e1b891a200463f2c17f6285b67070abd1d732ef2c578389a927f142495b3f721a6017f211684b27a3f5ce903cd774
+EBUILD gcc-13.0.1_pre20230419-r1.ebuild 1586 BLAKE2B 706553fd8f224c7217e937d152c1fc6147f694c9c12019b52509fce063382d769628fc1ff4eb6aa4cac2c9c9e38ee88ce139c4243098f9cd97e0df42aee9fe50 SHA512 0d0a31b864f8381b71b198f2e0c22821e07b9575a465e176946b6b4f0771a6ea32685d1dd0af0d6655597f781166c3074e7f1f8f1b14c3dd3e7e95ce254bb8d3
 EBUILD gcc-14.0.0.9999.ebuild 1308 BLAKE2B 13b309bfa235931db063ba9503ddac66f91cc7ec2e01008c2a8b732a780419a0ee5871ed05f118cd478b63e3943f8295bbbc199afd0eba50e4b3927079c18144 SHA512 3dcc2d4c6af3893c13fc786b8701adbf7d9a0fe0cea407589682dbc4face96eb8f383b686d07cb33a810c963d706e2fdc9c52d393a8852142871dceab5eb7370
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 719c259a6f39c72f7d1748095a9e649d4ab3dde04b118125313ab9b915eb9cbd038592532185317080dbc46d73a8bd324b498462db73b12d23144cd58378dd9c SHA512 1ed19c79239d155be3b267fcad4d7230821406ba8fb2c11857168fc0e717c4edcd8d7fb0972bc6df0fbcfbd8a9f085aa023f452368278c0e7e0af014c1124d89
diff --git a/sys-devel/gcc/gcc-10.4.1_p20230419.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230419.ebuild
new file mode 100644
index 000000000000..07a2b5e91ab4
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230419.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/gcc/gcc-13.0.1_pre20230419-r1.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230419-r1.ebuild
new file mode 100644
index 000000000000..f4945f9d1d2d
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230419-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_GCC_RC=1
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+MUSL_GCC_VER="13.1.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=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}.${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)))-RC2-$(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
+
+# 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"
+	KEYWORDS="~loong"
+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
+}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 0c1a95d98bf2..63dba07df669 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B 4db1dfc9b1997d31cc68240ae0b05afeae5a6b1cb24a0eb2012bc28b2ac8c0da4b532d270d070db5fd401717320a74b006628c19a12c787e2f9ba2dc24eb25b1 SHA512 73b2f0e7b27497ce9037cd10503b328378ff9a2e32cd36e6e264f5423cd05732da4ea2ef97b637fc344a4f3d5d3597c60dda29dba7eb509391c176d32d53a427
 EBUILD lld-15.0.7.ebuild 2262 BLAKE2B 8882ba45692d54840d8a5933910ade614427733f3da2e344cf4df2806c125a783ff3c6ad4a2f76fd577cb4787fe07495c93e981c03f116fa7f383575d59936f7 SHA512 9b08495f068a01e991d200363549d29e9146e8687b297fa06beda90da1da9a793b1ebf512c3dad9bb985518a8fd9d1d13049a90dd8f06d4bc3de97779ff8e6ed
 EBUILD lld-16.0.1.ebuild 2239 BLAKE2B 33f554acd6e1db31f9aec3d75b2c43994a95240ba42bcdf7060090231ff6214e896b5fd051fcb513337161cef408014f64391e9ecfcf5269749fcfdb8a3771da SHA512 a06a9e4ff4f9109dd4eb3f3fdb2308b043beca30c016b184a3f77e7c4728161b3a1b4a662fccf102419c4a3aabab9e30db5a3c87448fb8b2a91237bc08e834ea
-EBUILD lld-16.0.2.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
+EBUILD lld-16.0.2.ebuild 2239 BLAKE2B 33f554acd6e1db31f9aec3d75b2c43994a95240ba42bcdf7060090231ff6214e896b5fd051fcb513337161cef408014f64391e9ecfcf5269749fcfdb8a3771da SHA512 a06a9e4ff4f9109dd4eb3f3fdb2308b043beca30c016b184a3f77e7c4728161b3a1b4a662fccf102419c4a3aabab9e30db5a3c87448fb8b2a91237bc08e834ea
+EBUILD lld-16.0.3.9999.ebuild 2197 BLAKE2B 0f6db5db6fff4f572187749ab1704fce82e1859db1b7dd8b9de3652eed3e63ae781f7c48d16237576e9a186fe0680e349d160f15047cb5f54998fab7b8c0d60e SHA512 5de60e7ae08bade5028fb325e81ef82bf2aca38507d131e40505320587cbc43db5d74203d849cb057bee27b7f4e3820263f429db8454e4ca38bcc6f7e873bf9b
 EBUILD lld-17.0.0.9999.ebuild 2156 BLAKE2B 9d8e8a96037d4d319dc38cc9a7d0388e18af731fc91a7bd1a881e0beb41d7bdd55366f27bc4346273a8cc491f54ef7255dcc5d0fd516fffcd7b1cf0e0d054f01 SHA512 88c0be1d0edee7e0f1f48a81e029a7532068c69e098b0cccf531354c0acd277cf8c0a379e68eb67adc4c1576a675e9f6b32c4442f043f86b7ba8f873fa1eaed1
 EBUILD lld-17.0.0_pre20230325.ebuild 2149 BLAKE2B ee6280f1e83a7660c9ccd01ea2fbd6748996d8419d92ae8175af1616f6a86b267e15b90bf32d41585295b510457171ac071b82525828129f7484a40426aa009c SHA512 24e20f5ba77d2c79fe8db7836ed69879923c6f6f6a4c463776d5eada52073a668dfa5ce431bfe78f07a300519abb2c2bd1c6721bbfe89a2266fe339f7b80235f
 EBUILD lld-17.0.0_pre20230414.ebuild 2156 BLAKE2B 9d8e8a96037d4d319dc38cc9a7d0388e18af731fc91a7bd1a881e0beb41d7bdd55366f27bc4346273a8cc491f54ef7255dcc5d0fd516fffcd7b1cf0e0d054f01 SHA512 88c0be1d0edee7e0f1f48a81e029a7532068c69e098b0cccf531354c0acd277cf8c0a379e68eb67adc4c1576a675e9f6b32c4442f043f86b7ba8f873fa1eaed1
diff --git a/sys-devel/lld/lld-16.0.2.ebuild b/sys-devel/lld/lld-16.0.2.ebuild
new file mode 100644
index 000000000000..7ddfd8f8a755
--- /dev/null
+++ b/sys-devel/lld/lld-16.0.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}[zstd=]
+	sys-libs/zlib:=
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	${DEPEND}
+	!sys-devel/lld:0
+"
+BDEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+PDEPEND="
+	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	tc-is-cross-compiler &&	mycmakeargs+=(
+		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/lld/lld-16.0.2.9999.ebuild b/sys-devel/lld/lld-16.0.3.9999.ebuild
similarity index 100%
rename from sys-devel/lld/lld-16.0.2.9999.ebuild
rename to sys-devel/lld/lld-16.0.3.9999.ebuild
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 41757b1fe988..5d51d0c464e2 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
 EBUILD llvm-common-15.0.7.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62
 EBUILD llvm-common-16.0.1.ebuild 615 BLAKE2B dddab327388341f3330d7374a76bc1ea144aa5cad62feea34140b5825daf13118ff7185a6c2cce07479c3ca13c3ba8ad7cac7ba71a8b49fdd25a979d899a5b0a SHA512 57e7d90e7fc4f5dd2daddd1c7e8ed7885112120aca2b13b21e2fc719cfe5a87bb640aa67c605827bcd60aa71300abeba937e158ae1a1a16559236ef9e6d18319
-EBUILD llvm-common-16.0.2.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
+EBUILD llvm-common-16.0.2.ebuild 615 BLAKE2B dddab327388341f3330d7374a76bc1ea144aa5cad62feea34140b5825daf13118ff7185a6c2cce07479c3ca13c3ba8ad7cac7ba71a8b49fdd25a979d899a5b0a SHA512 57e7d90e7fc4f5dd2daddd1c7e8ed7885112120aca2b13b21e2fc719cfe5a87bb640aa67c605827bcd60aa71300abeba937e158ae1a1a16559236ef9e6d18319
+EBUILD llvm-common-16.0.3.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0.9999.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_pre20230325.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
 EBUILD llvm-common-17.0.0_pre20230414.ebuild 524 BLAKE2B 381b028d6ad33fa97d2ff250266bd896153222cb62647bc6c4a9f7493fc96c23faf788ce8a976d35333e8d40e63cad4c3f44322f6a41f1dbe53f9e772c3a40d9 SHA512 9661a9c544d8bf3edf6c24a307324a58652c8635703dcfa008cad96826e3404cbb05e5c95fe7df85ed6d2642e4f83cfff0c9a381b796cc78f560854aa071acbe
diff --git a/sys-devel/llvm-common/llvm-common-16.0.2.ebuild b/sys-devel/llvm-common/llvm-common-16.0.2.ebuild
new file mode 100644
index 000000000000..4dd4fe395fe7
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-16.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	!sys-devel/llvm:0
+"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-common/llvm-common-16.0.2.9999.ebuild b/sys-devel/llvm-common/llvm-common-16.0.3.9999.ebuild
similarity index 100%
rename from sys-devel/llvm-common/llvm-common-16.0.2.9999.ebuild
rename to sys-devel/llvm-common/llvm-common-16.0.3.9999.ebuild
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 71f72e6e6e4b..6b758f5ea331 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,6 +1,7 @@
 DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff6312b89abeef3fbe5da5d0b93bb2add1088ddf64a0b00ec8846062d19b1ad31e53eadee7ce03c9034aab554e183d1baccf6 SHA512 f8328dc2ec1e8d941d47e583ee31fae7bdcebb3f854b5c8a4a84bd19a79bf5427ad204012c81349bc05a291e41cf48e5129b4578bbd5d4490dd01e1c0b5823bf
 DIST llvm-15.0.7-manpages.tar.bz2 228425 BLAKE2B 573b030a32407cfe241fb2c8c62bed8e7c54f9daf4b8cffdd2d4e5ca2e40b5ec5ed3724475aedf77119be1a4d9de847a989e933d315e6d94908e407a19c98047 SHA512 86d5eeea2757b0a627c8d2d6e70a3265fc0207085f4e473cdd6e8b624c719625dead23fd1737742a1bea27b1c4631ef3e8e3041a1122a85fcb49859e5bfbee49
 DIST llvm-16.0.1-manpages.tar.bz2 243292 BLAKE2B febf892d91f16f1b320083563ebecd0632e26823e316c62d608f4445979423c597534e75191522202168d76e7aa355bbccff0378e0152e7a0ac14cb95ba7baaf SHA512 0183a421167d8d20bd60306a43d3c4069f87e73615102a7430c2a4bd057c96e7941c91b8d92cfe7b29f2691d517c4a5406052a3a818fcaf1356e0392397c1676
+DIST llvm-16.0.2-manpages.tar.bz2 245800 BLAKE2B f9672c11710d48d36f2a3508b6473746ad02223eeb9aa282929e2b7b8b89bf76d3c121c1df0ac78c66040b632e4090dad8e2baaf1d9862495eb991b1baa3f9ad SHA512 11183cc818500d7805831c79f77b279af27435304c3464d8f74b1f9dda915365e09d699d221e43f98f8bad8a14498d4a471dc13f9c3afe6d0eaaf7f59661a9fe
 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c
 DIST llvm-gentoo-patchset-15.0.7.tar.xz 19300 BLAKE2B b70e81d744c2eba5cd851e7b690ce8979b3064973f522be7c93bfb541860000a4bc8b17219f8788dfc8a527217dd13946cf7836640698ddd3d4b3fde493dfbf8 SHA512 daffff6ae4a0874aff1a423b4bb36701ecb5a35a36ae91d4ed7fda58b83e50ffcdc30498c84be4711fd3e1f227bf312dbe930019203e0a131944439af2aa94f7
 DIST llvm-project-0be1fbac2a7797399c0970e3f4033288036b65f6.tar.gz 181527027 BLAKE2B f2f3b3a33b2a50f3b4f97df16a948e5ed5e642f737de8e852da164aefd3ed9af7bbd0fc1de9f7c9dbee6b9b8ebe11e52af8cc79b8a130cff405fc1238afe217d SHA512 946cd1435a26673c851bdda170864d0c362dfc14d1a7087fbe6303ac79e1821e9c53b72e92d15ad7180b1d6ea3bcc0458e7bec37acc3e8b8bcca8efbb9ff2387
@@ -10,11 +11,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD llvm-14.0.6-r2.ebuild 12389 BLAKE2B 549b4e1c7feceb40c7e5aaa624925ec08627c84236c460f85a044621dc388cfca248f8a311c657a3b3dadbd367472f3c820a635c14246f74fdac98dd2ddf6fd1 SHA512 8559954b641fc007c92d4b3e2fcc129bdd812f974dccf37d74f61cb9d7414e28cbb41d7088767356035b972c1e417561770a89169676841e762e62644c6d0323
 EBUILD llvm-15.0.7.ebuild 12558 BLAKE2B 1f73f500a38ee4e96438a5e478781a562d48e10d550cd6c5beaf37a754ead1f0bedb121be78c6bee229f694cb085ee665f7b33a44eacba0d6eeaa42b545f6ca7 SHA512 92dd8f7f8554ee24978ef4e1409f5356a95455d2b5006da0a5dbf27cc277962916a0e93d2f7630a0eb3a9f3a1167eb9aeec0a319de3637c5762a7c391d3f5330
 EBUILD llvm-16.0.1.ebuild 12490 BLAKE2B 95b6ae05f64728668134ff348e5d084346285425e57c69a7345a44f85c832523b1219a76c3b2c6274e190b869569be3f91d9e5c0298e13167f3e6e0e8d676f66 SHA512 eec238ccb340ad901e130d984349ee4a9788bec4cd7def73a6c946becd1b86b74ee044e39cda48f892017a06e2a381a0424caaf44d073a51c64625c3b45411ba
-EBUILD llvm-16.0.2.9999.ebuild 12399 BLAKE2B d18e5df615286b2e89b9b4c8eb8b79984c20cc5022545f713d92df70bf5f404edc380d5175dd767fcd7957653a5bd0ba5a3ed602c7d7f3c2dea0a06eda7f7a4e SHA512 c0af4a0925717b1d8783383b543425f558a249056d8424d71d441e365867c24d6a8b243632d4c4f9685242d4f1b671591448553c5dde5acea1563e02381aa3a5
+EBUILD llvm-16.0.2.ebuild 12490 BLAKE2B 95b6ae05f64728668134ff348e5d084346285425e57c69a7345a44f85c832523b1219a76c3b2c6274e190b869569be3f91d9e5c0298e13167f3e6e0e8d676f66 SHA512 eec238ccb340ad901e130d984349ee4a9788bec4cd7def73a6c946becd1b86b74ee044e39cda48f892017a06e2a381a0424caaf44d073a51c64625c3b45411ba
+EBUILD llvm-16.0.3.9999.ebuild 12399 BLAKE2B d18e5df615286b2e89b9b4c8eb8b79984c20cc5022545f713d92df70bf5f404edc380d5175dd767fcd7957653a5bd0ba5a3ed602c7d7f3c2dea0a06eda7f7a4e SHA512 c0af4a0925717b1d8783383b543425f558a249056d8424d71d441e365867c24d6a8b243632d4c4f9685242d4f1b671591448553c5dde5acea1563e02381aa3a5
 EBUILD llvm-17.0.0.9999.ebuild 12757 BLAKE2B 0f9e50da2e9a963ad952b87b2194a6b47ee97fe75eb8a660cd1bc2e0d2c1ce6b780cac0778abb2095b86a575a4f432ecb8cf7a533f297514cfb13bb34a2b5856 SHA512 f55bebe64915822516013e30a5fb911b1be967ca96931373ea7cbaed5e6fcaf3e593016848803c5d57c89ac9aa58a2ca1ce6fef0ac9bb9d3dfc1a0028e64426a
 EBUILD llvm-17.0.0_pre20230325.ebuild 12572 BLAKE2B 8cb52862e845d3b05271be7a94d5c3a2d955959ccb5d4bda87ca152a37746ddc848060e1d69e79daa0a1a06d3da745baeda7301f6790aee39e66a9c92a01f1cb SHA512 d0b022959fcf70ca0ab5320b11ae55ababd302fa0e62afc13b3ba519620c26e12b922449008b5d8dd2d7dc397b9d39bc79787f5d10aa0bc55410db28c9a39a9c
 EBUILD llvm-17.0.0_pre20230414.ebuild 12757 BLAKE2B 0f9e50da2e9a963ad952b87b2194a6b47ee97fe75eb8a660cd1bc2e0d2c1ce6b780cac0778abb2095b86a575a4f432ecb8cf7a533f297514cfb13bb34a2b5856 SHA512 f55bebe64915822516013e30a5fb911b1be967ca96931373ea7cbaed5e6fcaf3e593016848803c5d57c89ac9aa58a2ca1ce6fef0ac9bb9d3dfc1a0028e64426a
diff --git a/sys-devel/llvm/llvm-16.0.2.ebuild b/sys-devel/llvm/llvm-16.0.2.ebuild
new file mode 100644
index 000000000000..164977c556dc
--- /dev/null
+++ b/sys-devel/llvm/llvm-16.0.2.ebuild
@@ -0,0 +1,517 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs flag-o-matic
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="
+	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
+	xml z3 zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-${LLVM_VERSION}.9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
+	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
+"
+
+LLVM_COMPONENTS=( llvm cmake )
+LLVM_TEST_COMPONENTS=( third-party )
+LLVM_MANPAGES=1
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_uptodate() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(${NINJA} -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the ebuild is up-to-date
+	check_uptodate
+
+	llvm.org_src_prepare
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+			UnicodeNameMappingGenerator
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfo-analyzer
+			llvm-debuginfod
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwarfutil
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-remark-size-diff
+			llvm-remarkutil
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_INCLUDE_BENCHMARKS=OFF
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+		-DLLVM_ENABLE_ZSTD=$(usex zstd)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	local suffix=
+	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
+		# the ABI of the main branch is not stable, so let's include
+		# the commit id in the SOVERSION to contain the breakage
+		suffix+="git${EGIT_VERSION::8}"
+	fi
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		suffix+="+libcxx"
+		mycmakeargs+=(
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+	mycmakeargs+=(
+		-DLLVM_VERSION_SUFFIX="${suffix}"
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	tc-env_build cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${LLVM_MAJOR} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvm/llvm-16.0.2.9999.ebuild b/sys-devel/llvm/llvm-16.0.3.9999.ebuild
similarity index 100%
rename from sys-devel/llvm/llvm-16.0.2.9999.ebuild
rename to sys-devel/llvm/llvm-16.0.3.9999.ebuild
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 8b593b5ece3e..abeb3742e69a 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,6 +1,6 @@
 DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15 SHA512 b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a SHA512 a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
 EBUILD mold-1.10.1.ebuild 2161 BLAKE2B 3ac1e9728556c58694e7ff460a49f5a6c3eaaf792c03aee0e4daa85ab74e4680550fa1c3253634c254a31e76a77792e0be7c1c4910533825f06bc719a1b9bbda SHA512 4d88a364d1e4c78bdb875861b1bdea5a848370199af5ecf05e2f8474433ee72d3f75e16f10445f5d17b994a45efd9e3a7860d5bda96ae5f938d575be0faec60d
-EBUILD mold-1.11.0.ebuild 2162 BLAKE2B 79d8291fbbc5375c36533f89721acce29bdda4c3502ce9fa5202defb1c6134c605995b471014831d7f13824eafcc446f75ee8a50c6a0f161899c08af8e307bc9 SHA512 281278811781fb9342d171a716d14cfdbd84e3b2172563daf126ac8da1bd89dbedd536e4bde9f2801a8656f34ca72147a7be0e0336e23ea1892d137f3452958f
+EBUILD mold-1.11.0.ebuild 2161 BLAKE2B 3ac1e9728556c58694e7ff460a49f5a6c3eaaf792c03aee0e4daa85ab74e4680550fa1c3253634c254a31e76a77792e0be7c1c4910533825f06bc719a1b9bbda SHA512 4d88a364d1e4c78bdb875861b1bdea5a848370199af5ecf05e2f8474433ee72d3f75e16f10445f5d17b994a45efd9e3a7860d5bda96ae5f938d575be0faec60d
 EBUILD mold-9999.ebuild 2162 BLAKE2B 79d8291fbbc5375c36533f89721acce29bdda4c3502ce9fa5202defb1c6134c605995b471014831d7f13824eafcc446f75ee8a50c6a0f161899c08af8e307bc9 SHA512 281278811781fb9342d171a716d14cfdbd84e3b2172563daf126ac8da1bd89dbedd536e4bde9f2801a8656f34ca72147a7be0e0336e23ea1892d137f3452958f
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-1.11.0.ebuild b/sys-devel/mold/mold-1.11.0.ebuild
index ea88934048d6..a574dbeb3b3a 100644
--- a/sys-devel/mold/mold-1.11.0.ebuild
+++ b/sys-devel/mold/mold-1.11.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b67f55da2c21..9ea6003ffe8a 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 71db7c1ff430..b0a2210dee85 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,5 +1,7 @@
 DIST mergerfs-2.34.1.tar.gz 343252 BLAKE2B 07fd53707cca0dcd7859b811a836eeeaea2a008eec808807cd02051b566bb0633a670858eb6b1e55bf4c7cf656146dfc7949e7feb8832b8ba8d6997b85de39ac SHA512 a76433cfd2e654c71e9f6dcae88b6739f59d07024c2ab32573586401fb8508cae4774bd65046646bc19737f7b5d52d1a8c89f3f4b33e08360c80540b94980c93
 DIST mergerfs-2.35.0.tar.gz 668826 BLAKE2B 21da9e90984082546886371877c31706c6a9f1297e55c5f5e35b7f7eb0e190a216c9cdc092917cc48530287268a11bf220d622d2e53bb89b04c044971f12c249 SHA512 c63ec871041a374350c62ba23016549984579b5dfef44a4415d78e6a2c6681d445bff26aad4b3b3bae7ef74ca9770743c90b0c61e979c993f5f65bae0c0c33c7
+DIST mergerfs-2.35.1.tar.gz 669100 BLAKE2B 25b442f0451b525509bd908ac1cd2e70ab33db599aab58e2baeca47eeb3a0d0b93f7fddb880e8fdbf1b6928d40c650e0df23c116741cad279cdf169cea000768 SHA512 09de354ae7a7c69f6e873145a754c3ed8a840d59ccc455c8913f2562babbe8787c7eb929c0ea2571b5292928e3cee7b547b0a52cdd833b03e679e11191b4a5b5
 EBUILD mergerfs-2.34.1.ebuild 1077 BLAKE2B 5416ad8a60a26e808614064c4dfa45be6552e0dfeab16d4c0c203fe39196a5cdd3390f6f9ebd76838267d7a9beb75d51e429a0bd45841eb70f8ddd0cabc4bde1 SHA512 ed5f77c414351d64620b82a93ee4038204656e4afb2104f75f95a3847d99e406d419d841b87de3180219f03a66e43fb5f4fef568e927b4d1ffa2b0bec2399e3f
 EBUILD mergerfs-2.35.0.ebuild 1079 BLAKE2B 700cf7d0540bfd552c39bb94bddb0596c9b8165862016254d179f14449226c85ec0595b18779f95d3543997e10bd2250d8ed06c8b088c6772b5f84eeec22fbe3 SHA512 28804b4be1be7f314b6b05b47bd5367503493845e71fff27af89bc1231078705e30a0584bf88d3f7f9e019bc270d85a0f4425b389cabbc5eab0624d3deb51c45
+EBUILD mergerfs-2.35.1.ebuild 1079 BLAKE2B 700cf7d0540bfd552c39bb94bddb0596c9b8165862016254d179f14449226c85ec0595b18779f95d3543997e10bd2250d8ed06c8b088c6772b5f84eeec22fbe3 SHA512 28804b4be1be7f314b6b05b47bd5367503493845e71fff27af89bc1231078705e30a0584bf88d3f7f9e019bc270d85a0f4425b389cabbc5eab0624d3deb51c45
 MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e
diff --git a/sys-fs/mergerfs/mergerfs-2.35.1.ebuild b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
new file mode 100644
index 000000000000..ad9d06e1fdee
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.35.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	# Hand made build system at it's finest.
+	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+	echo "#pragma once" >src/version.hpp || die
+	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+
+	if ! use xattr; then
+		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/725978
+	tc-export AR CC CXX
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index d0f6f15eabf1..bb996f2233c5 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,5 +1,5 @@
 DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0
 DIST squashfuse-0.1.105.tar.gz 65644 BLAKE2B 209808164a2803d1f4dedad048f29a809d92e5260193ff2db6a4eed4d887273f6b0b2a673123b9c460e587b9f9884c4115e2323f8de7f26535abcfe4de99ea20 SHA512 6bf18575fd4732f3b0e4530902f2556859c2efbbd781a31bdbf97fe6601412dc750a80354a8ab08a3132d4f8680ea5ff0dd04440f29243906f1017aa6c70bede
 EBUILD squashfuse-0.1.103.ebuild 1174 BLAKE2B ef44296fc316c7062019441bd584401ff5f66ebf632371a525b6fe8de20c9b9bf0684752477ebdfd6b6b17007b50725e1efc9f05622f5bf9c76fa4f8052b8c51 SHA512 7807ff7aa844fd0629f671c7ec1e50bee6ba0a3092334fc087b700d57b20d2af48ed24ad352a42048f70ec16924fc9a4f5b2309957236335c4ef9d566f708548
-EBUILD squashfuse-0.1.105.ebuild 1258 BLAKE2B e87c927ce5b016f876779ed9b2e4ecd2a51244d3dde0da7402fcf8758c766d20af011f03a7ed4d774eadf97560dce8c0092ae93a7819fed446825eeb994f318a SHA512 10e052787170934eb302916289d768e66459abb08ebcdbd40f4d37a7d05f28b2c4277970a1d6f7da23d7a7f3a1f5c424fe47c0e3279ff2c2dc21969593d9bd62
+EBUILD squashfuse-0.1.105.ebuild 1257 BLAKE2B 156828de9e132ae5480b2871df7a7d0130fff1ecdc8cef9cda68d021eccc6c5888e47ec9871fe60487f09b060da147bd1926b59ffdaf7a46500031ca7a5c8a92 SHA512 2f87fff28dcfcac6a97f6c9bff2751ca62fa3a5dc9bd3f40dd8cdfc72c533716eb24ff9cb9eedd90eb250c65e823428572e574ef7f0aa5f568a5237965fcf8f4
 MISC metadata.xml 513 BLAKE2B 0347d4259cc2e4fb927e569ed6ab9c656ded56368b5fe9efba757aba8bedb8ca6da50a6486023c92aedf6de669d73e6be46e9d92a1723b484f815f908d5c2771 SHA512 2b897a8696706e91dc149011274f0b4512f2adc37bfa774ab5bae6991bf8a8a4055e8aa5f9d5291076ead46f607b03adeb724e0380ffe3d863d6943d60179763
diff --git a/sys-fs/squashfuse/squashfuse-0.1.105.ebuild b/sys-fs/squashfuse/squashfuse-0.1.105.ebuild
index 39096e361436..099f0be0fccd 100644
--- a/sys-fs/squashfuse/squashfuse-0.1.105.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.1.105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2022 Gentoo Authors
+# Copyright 2016-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vasi/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="lz4 lzma lzo static-libs +zlib zstd"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6bb29a4abe92..df942702f7fb 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,11 +3,14 @@ AUX 2.1.7-ppc64-ieee128-compat.patch 6889 BLAKE2B 9214915ed5b1d149927d46f749903f
 AUX zfs-kmod-2.1.6-fgrep.patch 2183 BLAKE2B b8c9b58cc6d94e9ddeacbe3c5eca9d040f1c6fba84b814c8c553d5c1e15334765d3190286a4ad2298762bc54f66a8b89ef69d115cfbd5a25d928170a1d46a770 SHA512 f65e7ffa8cfd00da7ad6d1fcbf5d61172c52e55ea2630f719b49750692c1c046e8baed0e04cadc841adbd804cf861ec712b0d07dbbcae7c1c3b475326045ae8c
 DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271 SHA512 3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba2400005c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
 DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578 SHA512 a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
+DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a SHA512 335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
+DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01 SHA512 7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 EBUILD zfs-kmod-2.1.10-r1.ebuild 5576 BLAKE2B 815dd6a12488b0a17e67edc6b77709dc67c8c4eaa12b636fc878df712ce39c3abf5b80960d56cfa314ed9257a3b810b5c067305febd6af451dd6346246ce2f13 SHA512 d77feb3c9ac5698c8d1db64ff22dcd96bff54144e674ad1ef254fa5d1c047c5e0f29b165c037ece23dee9abe89f4ce0e93d1e71267841c69d209ab9dc1a7e65e
+EBUILD zfs-kmod-2.1.11.ebuild 5435 BLAKE2B 792a37580d9cc5452a9b200751d82d337a61f42f01db006b31d1a26b14c0e4c12c654addad3c2eb8b7368062c277dd32bc9e10d8e124e05d66caa753efaf7432 SHA512 ac23176a1c1bba0a6309d4f4c8d2114b2a720409789759c88a94264041495c01d6f3dbc8c8e2515428ca33b87d56886bb535e46015e5c1848bf924e1006629a0
 EBUILD zfs-kmod-2.1.7.ebuild 5580 BLAKE2B 5e4ef24ec54cf5dda899cf9151de0df0a2ef981a9f6a465ab381392dfe8a9214aecc29da61e83c8b317eb568abaa1abff6231660e1c608f709c88d6610da5264 SHA512 253c5cda1e71b51bd2938151ae62872e780a3e2ff3129ef14d39176697f23693c4692da167a3cfa9b386d8521bed63e5345ea8adb60b480d3bac44b198f7a477
 EBUILD zfs-kmod-2.1.9.ebuild 5432 BLAKE2B 1f3473798cb522c80b1d9d244aad191c0118ebaafc8d2041cfad82513b16d68221467473efed4a7b084a44cd0a19331089510ddc402fa064cb15bf21914766ff SHA512 ed69ee9fcfb0ab1db51c1e3ee2a0a155a3eccdd1d297f83dffc3376ef20558e0421e441db0b00302cc2dd499e1693e4b63bbb95102da800e42635f00be2e7f54
 EBUILD zfs-kmod-9999.ebuild 6569 BLAKE2B 2bf117650742e0044bf78d4838c0f8b1a2895d4bac31df742be78ce93aa321074840233d825b8844d01a2de0d1923d0f42bacb53109b7c034592babdb5c4dde9 SHA512 f0342de93072653647992b0b1c22c81f026697446b721fb44cde9808beea93651d58323ebdefb783adfc9eb3b2d8ff02fb267fdf6e4109e1b2355e1867ffedba
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
new file mode 100644
index 000000000000..8f9eaa5b452c
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.11.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="6.2"
+
+	# increments minor eg 5.14 -> 5.15, and still supports override.
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	app-alternatives/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+="
+		verify-sig? ( sec-keys/openpgp-keys-openzfs )
+		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+	"
+fi
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+	fi
+
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/zfs-${MY_PV}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	# Set CROSS_COMPILE in the environment.
+	# This allows the user to override it via make.conf or via a local Makefile.
+	# https://bugs.gentoo.org/811600
+	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+	local myconf=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=(
+		HOSTCC="$(tc-getBUILD_CC)"
+		V=1
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD=:
+		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
+		DESTDIR="${D}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		set_arch_to_pkgmgr
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	if has_version sys-boot/grub; then
+		ewarn "This version of OpenZFS includes support for new feature flags"
+		ewarn "that are incompatible with previous versions. GRUB2 support for"
+		ewarn "/boot with the new feature flags is not yet available."
+		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+		ewarn "Any new pools will be created with the new feature flags by default"
+		ewarn "and will not be compatible with older versions of OpenZFS. To"
+		ewarn "create a new pool that is backward compatible wih GRUB2, use "
+		ewarn
+		ewarn "zpool create -o compatibility=grub2 ..."
+		ewarn
+		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
+	fi
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e4ac120c1d7e..b414bf8c6bec 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -7,11 +7,14 @@ AUX 2.1.7-ppc64-ieee128-compat.patch 6889 BLAKE2B 9214915ed5b1d149927d46f749903f
 AUX 2.1.7-systemd-zed-restart-always.patch 919 BLAKE2B db72605abfeac766c297fdb617b4dc5e89de949770d407cd206da8e46b6abab6c64b35967bc94c5b35df819dbace12b5e425cb38fc93b4daddef32fceec395b3 SHA512 9070ee16494362e3b7aa8dfe5b47661efbb5cf65ea32e625bd3a7aa5cc0634fb3751e2e9859b7380e0975bbde3294fb2b718444f60309f7cb8c10afabcce3483
 DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271 SHA512 3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba2400005c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
 DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578 SHA512 a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
+DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a SHA512 335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
+DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01 SHA512 7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 EBUILD zfs-2.1.10.ebuild 9181 BLAKE2B ea7370b58ed42c3be9f05c6363512bbe6a57930fe9ae158e8cc5012139fb14216fa32a5ea1e739b5df40973d0c10e6aa48ef9df05a1f6a3d47c1c1492432b26e SHA512 6baacc42e25e5addd9e1eaf0c27b604560e75ae503eacb36ea4e176663aec832cf404084c5621bcfb7095363f57e7771b984df10fe607059dc1fa470d4e093ad
+EBUILD zfs-2.1.11.ebuild 9181 BLAKE2B ea7370b58ed42c3be9f05c6363512bbe6a57930fe9ae158e8cc5012139fb14216fa32a5ea1e739b5df40973d0c10e6aa48ef9df05a1f6a3d47c1c1492432b26e SHA512 6baacc42e25e5addd9e1eaf0c27b604560e75ae503eacb36ea4e176663aec832cf404084c5621bcfb7095363f57e7771b984df10fe607059dc1fa470d4e093ad
 EBUILD zfs-2.1.7-r1.ebuild 9496 BLAKE2B d5336d09ddd165f7306def6fdbfd97cc172a069ef185a3e30ea75421e4e138f96276fa2df4e185568e89dc49c36e64a258fa5b979a6433afbcd41ea7b207c8fa SHA512 a29d0796e982735483d579b174205e6af58a5d3ab098d1855b502bf66f96f12435d303ec2900ecc34cfc0e6f18e7261fcb76ad59660095544d905dda19801d91
 EBUILD zfs-2.1.9.ebuild 9178 BLAKE2B 18bd9ef88b73450f9a6b811d2e36ff511a78e098848bb997e90fc39d324b63766493b6e736d26132dd5cff9c44a2915c5f401b732bb0aee648ec821046b26b85 SHA512 10a5ad86a869b4978ce995fb561ddfb92d3739a0e7f4825b28132fc47320fb293e6519cf23f12da84c090ffb3a8b0188edaeee155ab34d8794a32c6c32a1ae22
 EBUILD zfs-9999.ebuild 9103 BLAKE2B f09254fe3a100d9e9c1cf2596a3c829bb192e97846ffed560ffeb76d5bd47fb920fbd0be4881f691301973cc63f3e1e9b2e31451bcc2226178e9c80608b91875 SHA512 33bb3dd7bf322776d0aa4dcded628257d3d57aef566bbb090f8f4b24ab0b435925cfe0008b2e245e70f55c7f5d56642a6d4c1e15e08cd48b66346e79285a6f20
diff --git a/sys-fs/zfs/zfs-2.1.11.ebuild b/sys-fs/zfs/zfs-2.1.11.ebuild
new file mode 100644
index 000000000000..e70bffe327e0
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.1.11.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${P%_rc?}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+# see libsoversion_check() below as well
+SLOT="0/5"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite"
+
+DEPEND="
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	dev-libs/openssl:0=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="app-alternatives/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+fi
+
+# awk is used for some scripts, completions, and the Dracut module
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	app-alternatives/awk
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+	)
+	selinux? ( sec-policy/selinux-zfs )
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	# bug #854333
+	"${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
+
+	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+libsoversion_check() {
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
+}
+
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	default
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	# All the same issue:
+	# Segfaults w/ GCC 12 and 'zfs send'
+	# bug #856373
+	# https://github.com/openzfs/zfs/issues/13620
+	# https://github.com/openzfs/zfs/issues/13605
+	append-flags -fno-tree-vectorize
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# Building zfs-mount-generator.c on musl breaks as strndupa
+		# isn't available. But systemd doesn't support musl anyway, so
+		# just disable building it.
+		$(use_enable !elibc_musl systemd)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index cac5e7263057..746099a65be3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index be13fc518009..f692b3db0516 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -13,6 +13,9 @@ DIST genpatches-4.14-322.extras.tar.xz 3660 BLAKE2B 94f8f1a40d4281869e0b81e7a694
 DIST genpatches-4.14-323.base.tar.xz 6120980 BLAKE2B ce25b7fca72106f0880e854cd3bbdf67883713ad225ab9fcee7b2b885c55dd71e4a94716634f1c8f435033cba4bafaa9d07709716b9cb4024ba2b12116fe61dc SHA512 b112ee9272079c6f36f753a0c2e290c7d5d41c9e846e9612cd87575562e80c2ed02a68c976cecd32d1f16155e44ffefac977778781917cc5e9b7d89cd2c64e92
 DIST genpatches-4.14-323.experimental.tar.xz 5712 BLAKE2B 867fc66039851262799062598553cd86a6ecff15293ba334306bedaf49797191ad798eab525b8c5500a11955229065b366990014e77a5dcf17e73ac3dec7ccb8 SHA512 bbcc7800c1d134ea5981763b5321e4b9434e20542f3c65d4235091319b24983d4a309f6bbd49e1cb448ce2554380720d16ed5416d1e1f9201abffedf5f3e6a05
 DIST genpatches-4.14-323.extras.tar.xz 3652 BLAKE2B 6272d7fed0f9377d884b6d14ba3b34a89e19783e25d6a51a52b66829f92a8d6edbbb37004e465815d8093d29ffdf4e9f43e6110b634c6e12ea9b2be305075616 SHA512 ae1c23a8e42096273b8141aaa841163f333332812d37af727d69f148c981d2ce26bfde6ee113c8604acd569d786fd3161b9b37827f30ea4669d2c39b1aca6ece
+DIST genpatches-4.14-324.base.tar.xz 6126324 BLAKE2B 850e911b5b7bc3d421dbff2c6162f6d098d2c70fa84a6a6fc120bdbfab6f0db157d59ef4f34ad0da04afcedb53d57ea0c11e2d820f07d0ece2236acd0f0c1893 SHA512 bd26c608321d2c24a3175f0f9a17036432d5e5b6f33c4fa59710a4dc9e90e4e492194c6e8806db4e506e9c838bab12de7b2add7a7b65d6155c9167804849075f
+DIST genpatches-4.14-324.experimental.tar.xz 5708 BLAKE2B 7088e68bacaff244c2943d6f7c9dca110ad6c840db1212c52f7b22513932f999116dc76e7dc70efb5da77f85782ad27f59183fcf1ea324c0b658feb4c55c711d SHA512 a1810ab4f05e7c026e9b2af4a28351e2c3626e28dd9c01bf0e980c9d0e83b4afcd2046749d78d22da1d9729cd8d2beabf4513214d0fc5366bfd19bbb0a1cd0ed
+DIST genpatches-4.14-324.extras.tar.xz 3652 BLAKE2B e5824e069c0f24d06fca7859a8887cb96c9b74ec54a8ac800362cdf963ed52d20f23741b2579343ddb55e61803cec12d38e26dde9d67d169817716ced36c82c3 SHA512 6221d314e7bc5c3f0ac9c6b9ffc0282f27db5d53b190ae8b44fae85e3c646d90df2a48382e4ab2d7c6b7dd5f670b0c76952b70e0cdedb5e8ab6117c8cf6abb96
 DIST genpatches-4.19-268.base.tar.xz 5866076 BLAKE2B eab0f67b6ddc72c7d9ccd8073bf51ebc3998bbf6177973def77d0241f32e6a204fc14fcd2d58c31ebbb5492fab2aff12f96c64592dc611475c8dffcaba9faa9c SHA512 0e501a12d97dcd8b9408e7c65eaa262d45a23b7db522054744749d219a0938f8306f88b3a11bc0715e29d8742a7168c4c89ba92a5fea03b32c997d582d54a8c3
 DIST genpatches-4.19-268.experimental.tar.xz 5460 BLAKE2B ff1b65fd218a0ac88f1f48be2a6f21aaa5a01f0609df74518ba34b42ca724ca7bc2fbe3841c1454db454162e7393a40cfaadefcf0faa150b41a1439ce260a9c2 SHA512 1812f45899972d821531843c294b34629396ac08eaac88fd26e229594690ebb64c80b139dde6aef1f3ecd904b7d75c9b56ea00d65f5076dd472dda0cf173f431
 DIST genpatches-4.19-268.extras.tar.xz 3664 BLAKE2B 9a4401bb3e2d7b14a968af60f9e4a6ae6fb9a75cb76e7de340414de20a11040ddfabf6441f7b40a27df34703a9a6f659797aec3a4a17d75e9ccc404f235073ad SHA512 9b58c6b5d7899443b20a42747f0e5b3b18016eaff75b9014960c5d72bfa93cfb988284a1474d051ac8e26331c8ec75b99c1f84df7b07cadc071d969f9981e77e
@@ -28,6 +31,9 @@ DIST genpatches-4.19-278.extras.tar.xz 3664 BLAKE2B 9aacf89a42b370273d665ca13d26
 DIST genpatches-4.19-280.base.tar.xz 6308720 BLAKE2B 0066f299ffac1bf0be59a1e2f73edbcfe13cb3d053b4039a803bc2eb2038f94585eb5d6b15c986d98fb34352df4d9053bf0e48feee13ba7ac5bf98d360a3bb80 SHA512 a78d43dd7aa92847d1520fb171910ba304e182adbe630c2aac256bd116140eb88ebbce2383462e2aaa44b70b7b04c17fd98fb908142d4317f6d923bd8cf95f49
 DIST genpatches-4.19-280.experimental.tar.xz 5460 BLAKE2B 2cf5f300fd0decdabb8942a9f924314330fcb1305759ea5982bf9e1602d5c04aeeb5c6d9f569e89262d4c803864b49d26686decd705b093c798b100f0f0b559a SHA512 509ae809bb54a9f0b993782406df4f1878a51589a5c9bf3742acb262bbbf9ad94a0d214db93673018811acf1e3d2903901b903c4896941e17b9c18f74fa7906c
 DIST genpatches-4.19-280.extras.tar.xz 3664 BLAKE2B 61770899b1f723187e8bd891d8552c9d7e6fcb3154564c006e7be7f2488395b10617387e80347dc4560db571db9a182e003a9fdf41477dfa2cab234a3a103e74 SHA512 267e9869a4365c815151342005c1232916cc26ab176275ebf93fc0c686d47f30f243dc93f03ae46cde202d1b30265dc9a2d92ae134b82f2796658da84b6fde7a
+DIST genpatches-4.19-281.base.tar.xz 6317688 BLAKE2B c7c1f3a78670af8fbd323ba7a1cb32dc9494de9bc50b81e9fdbf2f1ac300c0969d2b25bb539cb34b36c218b002f71810bb6477f583b4b022a7d50f3b89929bc1 SHA512 47aa1ecea133b0d89bba96e949e1561cc5046dafb09924265a2d1a48b0aac295e238c54164286ad49a394ac334e71a35477ccf438991823202bb7a5257742291
+DIST genpatches-4.19-281.experimental.tar.xz 5460 BLAKE2B 93b3c0f13e23e1f6664ebbb473e3fbeb2b57ecbe20e3e5f5cd204337da3dcbcb3b5b7c549bd056cbd469265ca970b228e972ee47c28ae4c16c750776113ddf0e SHA512 d9708a5d4d97ff235be0c5b1ead54ae556e4132c1b87bd3ee47c6ff7537cb7e778e28850d2233ee1095022efaa42f05590a59726b080c5754815a3a314fe8fd8
+DIST genpatches-4.19-281.extras.tar.xz 3664 BLAKE2B d10c62c55a5ff5bca84671bff0d8bc46bbcfffadba200ce30ab02348a0f9d9d80155fc6f79be9b9d0996ff1ab04cf7c1bfed84b8a42e95357a804797f0762e05 SHA512 b737afaab27be92898405291b96ea9a6f7068890a16b7b338b388f5cd3727854b5b7f272b8ea2bfdd6babf74202c39b6130c8e5c8f54cfc976effe5d72277aed
 DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
 DIST genpatches-5.10-172.experimental.tar.xz 16880 BLAKE2B ffcc645c2f82fa05d2bd07da4be09355a082de32f9192144917c1ec7f32038f07cf08c243087a20acf8efc8cf9b412b95bf9e1dd5e677f9f03e0ad1f9a6a1ae2 SHA512 baa241b96a5ff3aeb5db574843065db8714a91d7b3b33fcc83c917e4b092501b3479b05537901a3cebb86b7fedff82dbf5e861ff2d37d8c514131e1959940d44
 DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
@@ -43,6 +49,9 @@ DIST genpatches-5.10-185.extras.tar.xz 3868 BLAKE2B d42ae4d95f81771334ab313b01f8
 DIST genpatches-5.10-186.base.tar.xz 5195200 BLAKE2B 80451354985fedc89685d4bc6897aa66833eb2ae3916b8eeee9a5884107256f4050e8512194effa5f47123f580e50d2b1c454e178a46255aabb9c84a7d743cca SHA512 267850925d6c4d527cf9e847657d5a7d33d9073444a2a1076b81c0db1ee973b333f99b7c4165688bc2072f8a11447aa35e460039569369091ddf45d457b48839
 DIST genpatches-5.10-186.experimental.tar.xz 16864 BLAKE2B bb8c55731b88b0b739e0d1394d9f203dfe024192b0adc2a3c0d127cb66d0f970b7d4b0d52a7a10b674a4776e9b910e907cc2583e4d897514ffeb67d29339ae60 SHA512 8902c6999a5edafe9896448ed66c650230ddce19d10b9775a8296cbb4591b0623e9afd0d3290fe57116a6aaa7e0df202ce42a2ecbb91b59a291ce7fd01bfd304
 DIST genpatches-5.10-186.extras.tar.xz 3868 BLAKE2B fd83930f87ffab80902b20d931dc9131915e3d6d33f66d7698f5ec7bae211ef1da5d3be0b60a6871b8696e0ad3a60d71dd0b17fb09fb14eaf77a0d570f6e0948 SHA512 aa3df46b0a3640310377455592411b3254505b2262ce58f0c3a374077199ec0c7a63262dcba84ef88a553951c786cf6d9ace55a7cacce48d19696ab568c25cc5
+DIST genpatches-5.10-187.base.tar.xz 5232456 BLAKE2B 286880822b99151a2141cd880c9db078bce6d994ba34af779702358e958534e4962645d858c69abde2adbfb6b757bf2674f2e0147d50080adb615f0eb48f286f SHA512 2aa1bbd3ae2501eaf6cb2d9739322dce59580031696ca5e4b58750765aa9618222ecd02b1adfb5796100b3a44ef302a1266b0ca6430b36bed583b976fbc63c8b
+DIST genpatches-5.10-187.experimental.tar.xz 16880 BLAKE2B 9bd5893575c00348ba0e0abba7d0d7c0f82a0394c920c22f194587730b8728e91c2e98599d2c5e05bc3f7daeeba49fee3b2abc4b77ebbbced83fc56e37776866 SHA512 54f2cf7c1efde9dc3b8e10d82ce519ff1c4c421c2ec89461ca2d3ac8c399eb35255207a00658e19a1f4a10ba8926a86c153d0664cd795363306260c22794c020
+DIST genpatches-5.10-187.extras.tar.xz 3872 BLAKE2B f84dd90909c62c540aeb80714d78a9690095fae1e39bad7a4dd54a2536960c10c7a006d57fc7db367912f11bb1180e43d45ef051e23cc31cf7680c35c6eb23c9 SHA512 6e7a6ee7bfdded4246b499471254d6233e6de7e2cf1192505ff7da4cfe7f967adecb455b34374900ce482fd31482024a51486e2942eae6c600491762417cb247
 DIST genpatches-5.15-107.base.tar.xz 4209440 BLAKE2B 48fcb9a837d9f13ffa96194e2ec2209decd2d7c50a8d18ce4dadcd15f720496f5a82b821788bc20631b6ca4679cc3f93e48beae4a0c1c515747086476b5c1d5d SHA512 e66a46e0460dc940a021b37f673953d527d87c92f323d3f49d891339bc0040de492193e7415589b47b15ba37fcb05a7c1aeac31d612904afefaf2f748e1ec173
 DIST genpatches-5.15-107.experimental.tar.xz 5420 BLAKE2B 04391ff2a0f7267f7fc173840e8d1583092c4b3e071345492ae0ff2b1d2c0f1150e2dcbfc936f50adc4a732873fb0e567efec6fc6bef9bd506411d822d94763f SHA512 24442cb4a4b0b9a0b9a87f88550c928bf11e3bf0c947c7115d8f5789ebfa0dd920564013a29fe557849f460051ddec6a174c996be7fdf89b08a8256ea86b2180
 DIST genpatches-5.15-107.extras.tar.xz 3932 BLAKE2B 59b1279051d08009a8c6e15c5083d7056f7eab8b5beed72dd3421631e9730c7306ce7cae8c3c82f508db261c2a4b2076a2c6c7d3a5fe98419b240e87a0d1e636 SHA512 8897cf7b1d42fcb4a0a87417913c624dbc65b9ce5689dee3998b65cba54659e7ecea759c97f4993dca4b928fe7844e025aa8dbe54f5ca492d8f858fdeb9ba3d9
@@ -55,6 +64,9 @@ DIST genpatches-5.15-111.extras.tar.xz 3932 BLAKE2B 6607fe5f4c30a0252b2f999616fb
 DIST genpatches-5.15-112.base.tar.xz 4370104 BLAKE2B 578389e95be1b135fffdbcd598088d07d07ecc764307278c0339351d879594a994a4904500ee1b003ceb5ed928e95b5b07c363d94ff99db3e93568d25234fb26 SHA512 3797509bce6dd1949190f0d9bcb4d1c918c9bcd9f528b493b5f3b7e2fcb9265ea42e51e218c0342814e0f55c827ddd1bab130df76f849352e5894225d73bf3e8
 DIST genpatches-5.15-112.experimental.tar.xz 5424 BLAKE2B 06e2f9467e7ffc2bbf3b7357975dbe83fc1a953249fe78053f4b17b9c46d0087b59ba0968da2a48fed80f59e07451f609c44de2798b141712e492fd7aaeb18e9 SHA512 ee92637119e5a9f04d89843d0e2020a6012d91db13b2b43429bc3d273c73303b4ffc587e658bed7898ad02cedaf45337f9ea62bca67e7a3981713b1e89934a78
 DIST genpatches-5.15-112.extras.tar.xz 3932 BLAKE2B f76085492bf8b1c1bd9092174460be8ef5e22921f1f7a6282eff9cece01203ca68d0259b94a184161bfabddef1a7e5f1eb29b0da5eb85cc35853e767a2239216 SHA512 3e8ea63b9011f782b11e1df144414d9e3f53f24a391829342c872dd4f5b0a3c128dd792f95feab7aca08adf6a08d88e11ec2e2d61e0b0302546f0a55f29b78dc
+DIST genpatches-5.15-113.base.tar.xz 4409644 BLAKE2B 13570da5dea58b83b150817c0b121a796e5dc4e6416bb4e297ee2a180afa69e67e841787cb6baeeb59484fdf5d7d84603113103ffdf9e8e658da1e6f0a7e20b9 SHA512 6bbb567ccc12527598b56946ed20c060b40de4bd229ed146aedb5ab9f252a6d604529f87019198411ec2bf9cc5f3b87a376d5f65955ef30fb83297d4f701f918
+DIST genpatches-5.15-113.experimental.tar.xz 5420 BLAKE2B 73c714bf706f6ff97bda4394bbb633f5c26144d9fe6ca92a55c3b53c23793e211d330ce80115ad65155c7318643bba63cf64cba5c2ee60816236e8614ac75266 SHA512 2c33bda874bab3a8d25900134df7494094539233fb9e7322da67e981c21401a0c64f8346416a351c51ab420a0a1a2468dbf5fd4ac58fb98e29a99a43a45b6262
+DIST genpatches-5.15-113.extras.tar.xz 3932 BLAKE2B debd8f36bb718d8c92d5301d00efcfb42c057d22238d010bd17504dfae697b6427411e6a12e628155b25a98b235b95cf94428bb115fbfd0fa5a024ed85a53b7a SHA512 3336827f6273f4c0a39693ca7be1bd11c025031f529c4122014a205253f8ad6c247c51d696037304dff3014dedf82c493f8832d6e86b5d72b6c5b99972acfdc6
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.experimental.tar.xz 5420 BLAKE2B 9f091fe8429c6479c27819dfe6cd0ac04cc7f35d2af28cd69c6a8f9498664162343ce63de56c77aa3a14e70f638e741e3ffbe08c26a2cbfceca2b9bd6fd852cf SHA512 513f465509cb644e1420161bc909b7a1adc155ae6d7d7af4f0362d4fea4e7dcf5912cadb6737c1d33ed5b5b8dc5ab1b0de15c81bddd4d380b069307d1dc0d4b0
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
@@ -76,6 +88,9 @@ DIST genpatches-5.4-245.extras.tar.xz 1816 BLAKE2B fc61841df1540f85577ea31a34b0b
 DIST genpatches-5.4-246.base.tar.xz 5659072 BLAKE2B 4b3f836c7e9f7f4d1cac0c735bbbb7751c0c165c826cbf549033c9e9fb85be3ccf45d480b0c8d80f7d980daaa1fb62265b600e24dee320673434333bec891e0c SHA512 029102ba3170b99836ddf5e4a9a7101826eae3dcced431a7049e4c025ca6057f694c66f67a20d5b08a124275ed91aac3a0e1060ca2946fea54d68b251e61b478
 DIST genpatches-5.4-246.experimental.tar.xz 16908 BLAKE2B c7017745dfcdc6326e2a59748dd90e798c3d92f123f1e3cee13c277eb4d8d7f2cf98ea054ac7192f63d9b5d4020130fb369bca5b4b6bb2bd3689049d32921305 SHA512 e95779ba0985fe076d510bc0f48aa6b4e5985acf0d2c8f0c20d059768605be4d6e6d2e584ba396ea659568eb0b0aa96aa6c38d0a75aba394d6fb1dad46929723
 DIST genpatches-5.4-246.extras.tar.xz 1812 BLAKE2B 78297c82519cf71230dc19d674d345cb40d8226adab6af53c0c3af7239f7a1464b8c89b51b62c509b33e8b2eb1a8c102b10146a8a6151ab5f069a1e00f8f6f8c SHA512 13aa1321f559e01257926ef94dd023222c2be9225bb412424a4b4696c1e6d6abe3e7f29c375836e1f9986d496df89051a60c34e8f8070aa0bd556683a387e356
+DIST genpatches-5.4-247.base.tar.xz 5681456 BLAKE2B cafe9c11c4f1c5beceea2f8dbee2cbe9823c562a485242234a6606353fb237cef9508e8dc184f6c054ce1699b24af072c2e7952a406f776a566c40914d9ee434 SHA512 2db25e42bf227a836d9b378e8190b17f2075f3453a5492226eef031d2166bfc85859406fde6fea357ff05f6496bed28749355b5a66314f86b5abbb2dbcfbaf4a
+DIST genpatches-5.4-247.experimental.tar.xz 16896 BLAKE2B 171f28dd82fdb0fe1f3701c46295fe91186ff909564439618f2575ec1aba2f3b571eb7ee794998a086c845c54aef30e5cd0b906a4424ab3f02def373d42acaa2 SHA512 2df129dd0fa7978991bfa6a6a31d7a50fba0d42615911c525b2ab8f8fb567190719dfd94e6a1e9c2a501f44222abf624145ed5a67cc19050b0bf904c099390c0
+DIST genpatches-5.4-247.extras.tar.xz 1812 BLAKE2B d41b63d5aded3792a6c5fd922aafef3e4e7bbbf6f86ae7039271643010c221c404177406f3ee2071429df33abc8ceefd6d496a8d0d538cf5101d0e76161c36bc SHA512 e896b713dc8fe0094f97cd6191da51aafef454e0126e8f7ca00f866ba87074cf4d41830fbc6637b8ee7189a5dc529b32fc870d2c53c820a03db95675c9f2b340
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.experimental.tar.xz 71688 BLAKE2B d1a99bf47e60ce6101a0882e28878c358cf2d285faa27ba0ca6f83779d76c3a5189db0218bd88104bfbf0b4853f65c20329ba22b84e034e4f3d9ba38253ae84f SHA512 701183e4831ea295a003340bdc5be1ce934928a37f5b8690aba2fca63a595682881c0b2beb42bce988b557d0a76a4feddd97da34c77a1c93066fd7d5b85c6ccb
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
@@ -91,6 +106,9 @@ DIST genpatches-6.1-27.extras.tar.xz 3812 BLAKE2B bd1f13817906296ceeb943a211abfa
 DIST genpatches-6.1-28.base.tar.xz 1412456 BLAKE2B 126c74e7558efbfb104e97e993a70b628fe7882d756ef0ef29031b042651a8df3e2e940d31f85556453cd391358421594f9e089ed194e14b107932a8d525ddf2 SHA512 b033d8b873b0c8ebdd89b25dd25a814746b1debc0f0944da8fdc2ec9ed1da3d8d45816547119f7548ac30a91003c3c078a193875711d7839e4de71234192ac6d
 DIST genpatches-6.1-28.experimental.tar.xz 82764 BLAKE2B 89cac269b0adb25ba2c5248f2f5a3f7ecdc8dc0ba61e410e7b64e50e7ff40c45a7575912b228c8c07dc3225b57d48249e31b2ef5802527ac0d12d016cd385ed1 SHA512 f501275cdbf1452ce7770dd0e6d237f40ff2059d2508ee6136b78e64e1de88d95cbed51844b9890dc98e2f4c9e2dc0874dc22fb6d359994e6ae1705fab859e35
 DIST genpatches-6.1-28.extras.tar.xz 3808 BLAKE2B 3bd49fb256420883a267b2513cc9e6928a107b0142c82d9abd20114f733bfcbd474eeb19a7ef833da27ba625db28806ec25a1dd945f5d94f5bd5f729e445a57d SHA512 06c84adf52e36357fd01e8e1989ba8b8cb08bef052da05d261df3e80aac6d2d10a3c39583fad6d92936e19d8c7484786a4d11f64f2dc3fb5f8e1ee90106d6367
+DIST genpatches-6.1-29.base.tar.xz 1445804 BLAKE2B fb801efa1f48c9ff3362db22c218faf203dbc4171ee77f4539022c8f86ccbee65bb93c36e9796411dc997531dcb0b6c3cd2420a1b19ab5219fe92bf15ea3926a SHA512 c1797b202639b831fc601b6690fac85b91c1dd5dbb1520b243a5a2ed9bacc0b25f6614289b08cc5338ac8a66f8832a68a07b24ef327281c2e3c27e532a430d41
+DIST genpatches-6.1-29.experimental.tar.xz 82748 BLAKE2B b94127e4f634c12e2730348c9c151b3535b867c3845393d1c3628b33ceccfbe8fd5605b64199c40ba004c8981edaa92419afc6e4380d41152ea810695121d228 SHA512 6e4a402396fcd9a34d3dbe89bbd1eee7a7c0f72c928151af5ec531df29c88bd0e6dddd180684b98dfdf00e585fe8d1c3de5d40b3411b8c6acfc8303c3aad7fda
+DIST genpatches-6.1-29.extras.tar.xz 3812 BLAKE2B d77b52859028d028d6f33f7bdb26589ced57caf84c6ad5c0716f6fa978ff6a1c16518bc4ab06e76281ac486d7a5476878e408288b3ab4c55f8daa0a46a907c31 SHA512 3eee3d165bde6fc820307dc7483f228c7774237df8b5ddb0e5089b0f76fd3061a0223f2b1743f38f9facfb41a78deef0256ed4a9514431471265bb86ab64631d
 DIST genpatches-6.2-10.base.tar.xz 477872 BLAKE2B e95784495c97ccdb838e9a9d206c372545b3b06e5bd58c29c30d14a6fd615fae205934c665ce018b58b0f53534e5d440240079489da5c26de64913c50456281a SHA512 6f3730dc20c6a700f403fd8a01e0cf0b5d871e10c415a808ce91c53fb43e0c636c9e2767eddbc61d52137675a2a620d0efc7c5b48b06906ccbdfbbac8c927bb1
 DIST genpatches-6.2-10.experimental.tar.xz 72508 BLAKE2B dae135a7257452655563949dccca9b73e12f31bbdd5a30ca271ae0236dcda35096b0599b8c124da2ec13855ba431b7f10f5d6ad06cea5fc44513ee15256d1a24 SHA512 97f578bca15096c0baf87d24a09e5a77b045831cec5585d8aa976ecbf5123c81248a8b9d2b2b8c32ce2a4fea791a3f53555b9f79a6a133fddcf2a3e9b68c8142
 DIST genpatches-6.2-10.extras.tar.xz 3812 BLAKE2B f4a8c6c516e523bdd18ea881469ea19d8b5ab77b989ff79a71690cd321ae8c8f323801bb25f0861e1f648cd4162bdfff3a0858137fcfc20db6a2414088c8b994 SHA512 098b6c26dff1e420314cc9bf3e716d3c946b7f3ee8f2117744dd050d9a1cb266e4622d25b5d61990902dbec4e98ed46b991b10f15e43697ee61ffccbbf88f485
@@ -103,6 +121,9 @@ DIST genpatches-6.2-12.extras.tar.xz 3808 BLAKE2B 65df0f1a93ba2eda0ac31002f723d5
 DIST genpatches-6.2-13.base.tar.xz 700552 BLAKE2B 53187881831a5ee8ac1581d78d89b56d5e6cbd45a1267f294312fbd648818530f029280b6face5c1c7f7c6d2c13c5e3fc6d1747f4abea8b2065f960a42a45d2e SHA512 2ca287f97bb3c01291eb5faa1de40827d014547e2cbb5063e77597e027f58672a262bcc51f1f2111cb5621f75b59c61a3cfa40f30fe8bc923136f8de3dd3e1ca
 DIST genpatches-6.2-13.experimental.tar.xz 72492 BLAKE2B 4c0b3ba1be0d4e341513bfa935103db49eaf819a673206fd0e92a09afca6fad009bc14a7f69cac56a9d3e94b7010f5bfb4222e00070921dc389f39265b04e6b2 SHA512 f7221a4978c42691377bdcfe6a7eb8b36af8805a2d51615ea8b1e540ffc32e1bafcfbaa5b2c4403364c5b4aebe8cdf172c4324ce5d79b1deb8d53a55493b24a8
 DIST genpatches-6.2-13.extras.tar.xz 3812 BLAKE2B 2e0620c2c03f6775a4ee7d29aeace0ed2474edf371bdea0aff7ec8b11db0804641ba4d2cb1993fdd7936ad6075c1b7de0bca6c055327b25f17a74d4f3a9d5d4c SHA512 5a146e403f04c1b8fec69ff2824f4d0b446fea895126839aacc511b47b4eadcfcf61ced441e3886ad4fc018379b029305d72a99d34d98ef1fdf486e28e888ce2
+DIST genpatches-6.2-14.base.tar.xz 737376 BLAKE2B a31157486ed656f479c36a1d728627ba1361656e8a2d8a2dcaee0ee59e6edd6c046ad7799d2458e42990d53ea9893e49f26447a380b0c5bb02f8033e8ed3fc1b SHA512 126b365b3d5dd435e3ce8eac2b030bdeb227c3047d9b7182a289adc3746fd35f6454f08fa9ac323b83544d2ed614d9d1c1da569c74d8c61c50b14ab358ce4115
+DIST genpatches-6.2-14.experimental.tar.xz 72460 BLAKE2B 90efe91acb08b0a21331bb43b80d103eae1d32e132a1e4f5eb86ec6e63e2671d7cf1bcf2313a103a0692e470de8651fc03faa5c675d3263023d2348861bc851e SHA512 19c626fcef5b1304b366a372e706edc82e67ffc0ebf7dc8e56a1b89f98a9de1dd1126b0954882bbd189bfb570a080448fc5366d34556cdf77fa7646b0298ae75
+DIST genpatches-6.2-14.extras.tar.xz 3812 BLAKE2B 8ed801102acaade5ee6191264cab8a982a707e6b8419094e044b411a7c042689457c1351299b9ca0676c7223bad8e87b241938059fb1f3fb664be3d8ec31ef70 SHA512 f8ee31a4456482e23609797d87822da87940f97925fab08ff8828746fc93ba5023f4b1d4f21dfd76931ac37ac2465accc4e999b631bce6e16c83bad7689432b7
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -115,20 +136,24 @@ EBUILD gentoo-sources-4.14.305.ebuild 736 BLAKE2B 5bddebaa42ee5ca838ca4fbc6551fd
 EBUILD gentoo-sources-4.14.309.ebuild 745 BLAKE2B 1b63bd2ccff4151ce503f769f3e19831f04b50175b4480fe40167b2ce53b5264b8939a5f372465879018d38b9dea1ec5fb0c132bbbb8c7a4c8003746011292d7 SHA512 f7e6cd253f8ab4008341157016d491a556834827da294f3094b67a71cbd383ea04c0eae1647faa233a7f33f727e52f479b634b7be14e9d115dea89fde5e61dd8
 EBUILD gentoo-sources-4.14.311.ebuild 749 BLAKE2B 59ba838be5b125dfae6363250e601763ebaf506bcd904af3f77077185ca53e5cb1ea817d5dbc9bda592447bfee02cf768c54ca645f456916305be478ca53074f SHA512 5c1a21972d2b14435a4535c4753df62528ac4a238ee38fd9ccb5c2390185e6a63b492f2d9b6391a6a6cc6b3b11b11df75e5b49c7f7c0d544e25b477ce09f9435
 EBUILD gentoo-sources-4.14.312.ebuild 749 BLAKE2B 3d852643c599b5a120c7a2e689189dc2a259e5e2b444b3b40e2603cc17e91c3c6f14dfaed508e7d0f05ba0e20e86c4d5687e5298b8835354ddb8ea6486ee40de SHA512 cdc17fec73deba2658d20af4a0140ab207aefd9900a3c2f225b70b0e2d7155eecc1e92ee3b125dd7cc135114a82bc7a9184c6e540c609e5fcda3eee95fbee744
+EBUILD gentoo-sources-4.14.313.ebuild 749 BLAKE2B 26f29eddbeafe776e2ec1729fbed96c681e20c984f537a6a773b9f4c06e11669783ac361f27e3addb553422acce873f3ffc5120d26002ab132d47877e23e247a SHA512 cec133cfacc2b53f492b260ea4b44f2840e5e1a9c639abad64e5227ec29dcc425b046851ee33c85376925ad5996b00811cf91abc81563fed3c709188052424e6
 EBUILD gentoo-sources-4.19.269.ebuild 668 BLAKE2B 8a2c6b99c9258e49bdaea5d6982b841ff0841b5174c88ae768fd1555cbb6799ec44632abbfd5537e34fc581829d2fc5eb47d2148f5eef0fbec4f633f89a70ce7 SHA512 ff7ee66fb27ac2d563d9e0dc32760f7ea288836c5f3d2705365d907a3ddf38ee02efdd7e9a2878681362b95eda804a4beb21cd6135d897fa34b4740677fb230c
 EBUILD gentoo-sources-4.19.272.ebuild 736 BLAKE2B 02df789f5c3da309e30a6350e37dcfcb7ab21f952203f5fc75e7b8d46cdc7078786056ea0434c580b20b9c25dc4d65653c1d6cfe73a057541336fc4ddc181d3b SHA512 782f986787f677852914642f2b7d0bc7628c0aa5e0f04d0489daf5f1c21c1609bc5beb601bb9b24cb9dccd322185c381b2c0fa0b6b4363f3d90e8c71888f07aa
 EBUILD gentoo-sources-4.19.277.ebuild 745 BLAKE2B dc0d68f7aa084c3e87be05ad0a6d2495c518b7b6a8eb0b1ed3b5f37c16f6e02616b43ba1a3da39454ae45deb8aa5b0ba88309542a92659362326aab2b556c287 SHA512 3e1c9586e9715e1c28207541c80b462b234cbe491e13f92dd8743734b1862b7ec2fbb5ff427291d33afc499cc2eb247aad26a505100b68ac87bd2113f1f00f6c
 EBUILD gentoo-sources-4.19.279.ebuild 749 BLAKE2B 2700c6d0970ece7fb0528d2e181f367a1af18c92f5f77db9769a8c8644f978127959147f42eed9678502d4c919a631e064e664f3b8c89cb8758ea799c7fd9ad4 SHA512 626f7288a387fcebc8e4573f1728088411572d5e7d5fb7bfb3c0bae7e61e4f1fd68ba10bb14ab4b0fe339f12df32687345165d9d964f52bcf2f75d344b4ed07d
 EBUILD gentoo-sources-4.19.280.ebuild 749 BLAKE2B c03e2c3c031f4c048a5869b80b8dc98eea7e6247ba3ed99076ff835747dfb2087f223b99f844bdb1a398682282c42e098efbe1891ca72a368994f04886f0f5fa SHA512 0294875eb8506327d498ade037d48d972ca87757c84f5cf4ebb8fbac4b4b04e37e882022bb29bd999e055ea20ded3e2cc47e60fc5493ef70a716c89729838b40
+EBUILD gentoo-sources-4.19.281.ebuild 749 BLAKE2B 8db317fae3e964a10ba34083bbc9d7325233420f753a91f5390337cc87e2893b23f2e22ebca2f8d3a76ef3644a01158118d84b3a393b5f5d1c177705e5f0ae02 SHA512 8302bc1f43e0f605b6fdc7b5c378fae2e6f690321cf1b8d5a41dbe3083ed9b22117e835b2ca803b46966a1f1db0fdd69e90c94ea877c7c38cce7305a68da6b44
 EBUILD gentoo-sources-5.10.163.ebuild 668 BLAKE2B 2d44067bf919d7236d95b4bd4dd5617af2629d5d68aeead5007e5388d48a975a285e46e35b03a72d16423d0bcfad413ef1087fa4dbb418246222f02de2f10623 SHA512 5d833bc643bb9aeed6217523e1afc16990db28477f13f748c41c3e840125a7e8bc5d4d73c0751efba1ef5f4b8db7f2d158322251c14fe1dc4212b0a8fb8f7ed9
 EBUILD gentoo-sources-5.10.167.ebuild 743 BLAKE2B e70407deb87ab13a77fde033d72301508eb4d07ec467299bf8679b3fc2da214b0d73ea3ff35f42bfc63e7aff0cd4f5304946bf3dd510e1ae37d77ffc4c9aa822 SHA512 c8fd5fedfa428a3a31a8f81d530dfbc0352c597ce8f6f8ce3eadaa435e823450a3d080e296a73d40774d29d8723db52397605765a52a502417ff6a2e1c3bf236
 EBUILD gentoo-sources-5.10.174.ebuild 745 BLAKE2B 0051051bc72f6bc0a97f07e039ade7226d63b5d74d8fa7166383f1f081b7f4131f5c2abde1d071e7cd44bd87b6403baf1f400eb1bbc99b59dce8cd736ab84d83 SHA512 d860891796876967965ba471ac685302777f82525a3946ae9f33ebe1f000272cfa4679e9302276e6ca012fa3c4687edbeaa4c34613344ac031c28bf5f8b7dbbe
 EBUILD gentoo-sources-5.10.176.ebuild 749 BLAKE2B 303fdc438987f6d0ad25ccbc7256c2f3f828b4bb36a0159cf86671525b84030289f62b5536adc12151420cb70d930668f2d51af429b7e6a0e0694a99a60d14e6 SHA512 03c47d7aac085c836162603d7504564fd7d99cd577c38cee37e907dcb5622906706c8cae3ea67affa7a413601b1364841cba240da15331e5c2f8557630d95bd7
 EBUILD gentoo-sources-5.10.177.ebuild 749 BLAKE2B 2400af35ab9ab531702446e219979b3ebea688b2df9ebcc49569a760f8d92af17717f4f19294d58c61a84fd799a32f238db2da44fbf18701432c91c37827ba88 SHA512 7a458fbdfb358e9d5cf7b0b315ccc7eb9a1c6a3e8f0439735e0771fa1aff725c532fa52f63a11a6afa7d53eace3626e29a042aa1cfde6c45efea2c36754808ae
+EBUILD gentoo-sources-5.10.178.ebuild 749 BLAKE2B 37964d5701715038b748024fc760970ffee82395a8714965cbf21c10edf2f2b08df45160a76a5e9dabe9d80095714bdf37ee65e000b6e8b8dd7b1fa8fdb37a90 SHA512 e6600d84d7f7cc4711ae5a4057b0dd43d77b7957fd8023f00a5a7b212f44bb3fd8f2530f7a7f64a914aac254a477bddd433013822559b751b9dba0947971d438
 EBUILD gentoo-sources-5.15.102.ebuild 745 BLAKE2B a11fc81a1faef9dbf2af930bbf435f057b5cccc923ffa9a1bce3ea44bf3af30c84711ccc4cb90d0570b7a436fdfd07d70b316499fd545fa555c4e86793005f8f SHA512 0f86257f14d76122b46991a58830fea7393bd38d9f96dcedbf4778d6db8f47cdc508f172e1500fd4c912edc942cca253021b865d866a1d40c59e0ba173b365d1
 EBUILD gentoo-sources-5.15.105.ebuild 749 BLAKE2B a6149c4e222d15952779159a7a68fa84bf3fd84415cb0478fe0f11bb50fe247e984ea301ccff23976c4c13752de0d47e2f5ff6c1c8f86da2a4123f7c91209b04 SHA512 c8be802e41bf9488088a0f0f06599b1d24f99b5c3bd7f2c6ebdc806ddb581711cddf217bcc67fcec65154c6c6575c9060300c18eb1c5b2be4f04c7c30a156108
 EBUILD gentoo-sources-5.15.106.ebuild 749 BLAKE2B 42c2ab15a34c237f52673b8004f41c643209b8c05aa31db69b86b62e361e20a8617600afa8585c68600532db98b6e5e12ec16700e18eca33c963683c977da7f7 SHA512 0aebae19907c24ebc39ed10013b94287ee796091faaab4108308f0d6ab7d3f5d8a03e068830d3b2cf5c99373e5d5d9d689a34205ed0c26afc48f445dde89336d
 EBUILD gentoo-sources-5.15.107.ebuild 749 BLAKE2B 59f2b74ac6bb99264d54fff00663b8d8f4f3c87bca1da6d6e65801699938a42cd2bd73748967b64a5266c15e85b0755731eb9f7508848fe2246788d60c1b574e SHA512 8273a21b7506512a1819c0b0c3c0766ab61784288d17078ab09a114c4fe8f08cf2bc7d5870478a9d635664356e85abc6ff54a0f680053ca472d6081cbfbfdc8b
+EBUILD gentoo-sources-5.15.108.ebuild 749 BLAKE2B 15e6a29283be6ab29c080ef0ac53905a4d0688625fda94b71036378a5b65c825c8efe1355bcce98dbcaa530c2feea509cd2bb22454fe762f2e7f8052b043dcc0 SHA512 f4f10f5c4b72c2cd0e21b919cf7f57b0edc75750f16140fee26fc53656838baec84b38d0d666531efa442162f67e92dd68446358aafe74213a0665304911a999
 EBUILD gentoo-sources-5.15.88.ebuild 667 BLAKE2B d0247d4420e5641e782cf5d56a28a06f0fcf4382165d6738d9d71b366132e28c59a8997bcf06d03f5b0551ba8369b3b66a753c6c34bdb12811c7829d655011c7 SHA512 1e349b66dd31540585598a195599a4528ca72cb4ac1ba210010ccadcc2556972382a42446e36f0af87362383d943e6c45696eb78d25bdd5661a20cf653668e08
 EBUILD gentoo-sources-5.15.94.ebuild 742 BLAKE2B ba7248692e7df0bdab0566b0b673146dfcd2109eb024a7cb1baae5e22ac65a5c8e960c6f264c70290c9ad00606396028e27c372ed065e88f12359a660999eb5b SHA512 2c21e3ba35673877a368b43eab390dacb22cdd6201e4347748b91356d9733f1d9c29e2c58e2d6d942d2f6b6567ca035ecb39b082954b7db1e8383c314fbcece1
 EBUILD gentoo-sources-5.4.228.ebuild 668 BLAKE2B 4924ae935dc19e1b3d6b38135ae7813345afe62309ee86052eec66de82d04920c15e487765d9ed5b34373b63e07ddec52e80213d04a519355cd835a81bb7468a SHA512 2baa506b1cd845e693a51394d0251b071ac6f49d38bbc1ab1c12bc6a0b7849ad76f9ffebdabfaa974691cf5e3ac8007db6edfc962a649f5da1f743ff14d70f8a
@@ -136,13 +161,16 @@ EBUILD gentoo-sources-5.4.231.ebuild 736 BLAKE2B b350d6563a7a0c897f22b666a051a5d
 EBUILD gentoo-sources-5.4.236.ebuild 745 BLAKE2B ada1f269542ac420af75ca96a96f4728a1a4e49b2d8e3b671039c4f64731422f808e71c8877d5fb1937931c94b6b6695da23b703f3bbcc9706215ff9c1a9f972 SHA512 975695ce1d9a176c0b14751a7eb540874a4949f84e2a273f8b7bf7a92fe994d23ec3fd568dd961a337dd0811759c607e11fd82e9f8f5f685bcaa054c9eb103be
 EBUILD gentoo-sources-5.4.239.ebuild 749 BLAKE2B 1ec48dd6adb688b35f6632154a3602c26e67ace73ea37e48575b7dd00769e794cc0012e7d5b3ae9b1a42f8af09f33e503f1503b67bdebbd14fab88a9cd1f4e8b SHA512 567c019561b379e78c88fd287f92d48d064bf2dbd839f104dc6d5e9a88a84697780d9dd92d704494a231f28d821ddbff102f7198089040a0a093013447b8e8e3
 EBUILD gentoo-sources-5.4.240.ebuild 749 BLAKE2B 7a14d04768975cb6b213e2ba5b8ee0f4aae18266465e909d19dcb6fc8c455e8f9dac5a3f1de89b0564e8ae40d1ba2f82919a6f890611e1d25e77ba4f2357cdff SHA512 c66a62df19ed1d13c7909427a7487f7c8b050e3a069881c6ba6f5ef5bad85e9e23ceb718be742e276fb71aed3a18d05c6220fd4e75055f42425672c143c385ca
+EBUILD gentoo-sources-5.4.241.ebuild 749 BLAKE2B 2fe163a8667ef2ec4654f507d073cb85f6e72ede745b76df08e9f941ec79652587f02100983f291705001cba106e364b7d0310ca0c01303689064608c8e5d989 SHA512 759575ee4e395c9a31cef1b0fd22c3e05bed5c5ff182ac111d3ef3cd7152710690fb767c09fd9558b82e64c902e26beacd55dcfd4ed2feadc74fc39154541ddb
 EBUILD gentoo-sources-6.1.12.ebuild 743 BLAKE2B 39249fb257735f33220ee38d7abf4ba841c4062021cd558b69c46a95812b44d61197f66c9619d42bc50ae2dd6461a074f87c99ebd72441e9ffce996b5506707c SHA512 9dfd91f54984eb0b7019147df57e55b484e8a08b1392aa2542842d918b5da1553f569c1903ee0e5b9d5dbdbdd6d85690f16c553b974151f88733d783cffffdb7
 EBUILD gentoo-sources-6.1.19.ebuild 744 BLAKE2B 359fd074260d646362f7e4d8d665c7543c69b5e9a5a24c42ecdafd9d7c3a12dfadb5bba07d90f638a21f7ab4f577dfc2da14f1a5b88c0aea244ce8d6346f41d0 SHA512 5bd4d6747333ff1f76d8803b3eba294225ad500fc32b92a73c2e86736b744e65518570fde1bd5144410f478cedeb1cb3a4f92eea7e91514b3469c271d6933c30
 EBUILD gentoo-sources-6.1.22.ebuild 748 BLAKE2B ee2fe98a62b4dd3a7512ec07fccface750f21dd13c7511f8988b99f8bb1fb59bd67eece3235e60f54b2974314b08891094110347f28765245476e06aa50ec4e0 SHA512 b0801eeec81f41994a729414ff94c64d40bc6baea31603fab6b6eb7c744e98a155a0ccf3d02d47b04d46b085608907f26f656c0c8687efbe7513513f872f36d2
 EBUILD gentoo-sources-6.1.23.ebuild 748 BLAKE2B b2669212303ab4fec8d3c1078b56b7c2317d558bf008cfd124d4d5b7db77bbe64ea1f0b315336a25045e71370f3b10e51de769092f7be9419de7cb03e418f212 SHA512 2d5e55dd04c24eee2bbbf4ce3ed37adc76e5a0d318c7da27b05c196f56a5d032831188f25e33d01ac10c952af153e5bc462dbac1797f6307f9506bc259c1c788
 EBUILD gentoo-sources-6.1.24.ebuild 748 BLAKE2B 1ce8085d9efd104cbd58f26c4904c27b1e30611d3c42a6ba05feefc6835dd25e79cc27dce80308879f4a9aee61994e06a32649f58048898328ce503fc2ee87aa SHA512 73fb834de22ac840f41f00169dded68eade2b6d3e93bdeef6d45f579ef0f70331ebb240f50f0f1a55dfe3f79b36363737f039e275e9491512b4f62c3a4a48640
+EBUILD gentoo-sources-6.1.25.ebuild 748 BLAKE2B 66bd8f422cb8b32bdaa7fc1d5647058be343807c741e2ee62f408e85c65bd331f421272deb25b88c073b2207e558bf0ffc1b7a481388cdc21a6f12bbdedec073 SHA512 966b500ef5527cd7cd315f7e05f31dc5cd2a9a0a2999f1c9b980c00a3d729041a0947eae41a9a03878a7b226604bc63c9134cbe0307fe8eb633014f5056d994e
 EBUILD gentoo-sources-6.2.10.ebuild 755 BLAKE2B b6d6325c48dc814a3617f1099032105c3341babde9426691ff3bf4f1525e764baabc1db4e5a53ac3f89c28ae230e6da9827e09b7008b67ede7d7245f5dab397c SHA512 3855a7370800cded2a49f4b7ebb446e84a9175ea706935531dd394afd72c1c004fb5f8f47780a594aae2f1856bbfa2f038f3658471718a4aed1fe5812300226d
 EBUILD gentoo-sources-6.2.11.ebuild 755 BLAKE2B 1fec7a6db765b9835eced45b7be166e5fe79b5d24871ae150bf4d3fa9f038dbd1bd7e4e4c5f180526b75fcc6094452bb36247cf905af17d342b004cc2e119f2b SHA512 86751130cc1042d906baeb7b187538ccc739e08c26f5a3847c8fbaf447caa6ac0e45c4e5717c4f8108c55d464916b686ab5c1153a4a2cbb596db667fe8aa414e
+EBUILD gentoo-sources-6.2.12.ebuild 755 BLAKE2B d8a02c110c18fb30c2192b8808d8b666d3fbd5c7547a1d20489cd11aca85ed78625153bc3f274d27958c80cc9297bdcc78e8345c2b2a908505a8a05230f5dd2e SHA512 80184bdfdc7cbd64050225a4d7d71b2e9fd0ceded7cc756168b868961e0db98f0be908621275ac4b214c9626a0974b34c3d3ae59a45875201f10e2fda7cc6a5c
 EBUILD gentoo-sources-6.2.8.ebuild 755 BLAKE2B 5dbefb3a1eb2141a90b445645ab173946d3353346b952f912b9a0d589ffa441a62f2add71d080a36cada0496090895fec5d39b4814bfddee288ad294bada30a9 SHA512 e0dcf84b5d80041ecff19b0c97fe81f4f2ba80a52949b3803bfe62ba41a55fa0e783af72c3972a7cb02a96d2e73753d829ccdc351970230904ebb3bcc4fd47ab
 EBUILD gentoo-sources-6.2.9.ebuild 755 BLAKE2B dbd2a92da21e6c0975d37eb3eaf2ad2a212db7febb6366e8e18418de148dd0019a0a777e54a3707499c988fb037b9c434769adf3e70957f38055e0f3a3c7bd6a SHA512 a181b29e7fc6959d22b39618bca8a91873a4968d3eaedb7e2d74771b3c71ea9e0902b53caacd21f8e2e0913fcb43c2508b30d7f85f031477869c59cd31d27771
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.313.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.313.ebuild
new file mode 100644
index 000000000000..4dcd8125a825
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.313.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="324"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.281.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.281.ebuild
new file mode 100644
index 000000000000..3db909b28d46
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.281.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="281"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.178.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.178.ebuild
new file mode 100644
index 000000000000..48cf656f0527
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.178.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="187"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.108.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.108.ebuild
new file mode 100644
index 000000000000..fed074edfb45
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.108.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="113"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.241.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.241.ebuild
new file mode 100644
index 000000000000..ee1e0c907254
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.241.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="247"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.1.25.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.25.ebuild
new file mode 100644
index 000000000000..85a8ff3822de
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.25.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="29"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.2.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.12.ebuild
new file mode 100644
index 000000000000..cf46920a26d9
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/rt-sources/Manifest b/sys-kernel/rt-sources/Manifest
index 5b963dd25297..1bc9a968ba14 100644
--- a/sys-kernel/rt-sources/Manifest
+++ b/sys-kernel/rt-sources/Manifest
@@ -22,8 +22,8 @@ DIST patch-4.9.327-rt197.patch.xz 169900 BLAKE2B 432b68f260db4970c3bd844a4d1a870
 DIST patch-4.9.327.xz 4449004 BLAKE2B b48aa23af600cafe5117854b76105c9c65adf9f2f026927367781cd360c61c551b174d2ea73eb02543e626408b27bf3bb8cfed62d9c36e9bac6d22c7e1099a48 SHA512 d6a5421cfbd70ff20664cbf05f9c955f03b55c3e22306f7adfd87ed760794817fd7d2211e5d92b169df64d8578717a9250c7ea6ca312bf10287a7283bf66d0e6
 DIST patch-5.10.176-rt86.patch.xz 171044 BLAKE2B da24333ea54bc11f15cbf7da03cc6a8d23bcc15253b0ea2c4c0155bff1ba1abcaba12e71cfec64e7a7dcef3a246569e72e174222c8ec23f97947700bb5836b51 SHA512 fcc8da740b152488cea4ca6f5d48a4180097472bbef135befaa54a651aaf309a81491a2e622a36e6e9a6aa32ea78742d7ec7cc1de80f03ff00dcbdc2a2e34ea8
 DIST patch-5.10.176.xz 4502716 BLAKE2B f5e3ac584d7d50dec23dd23880398b576a1adcfd0f31251f8b0f68b54e250f1ab67a8e7e6c10e910892c52e0681b0c32a9b153b2fe727c7c117332171c79e329 SHA512 d9e63b37991995123f45ea08287f6b7d978293acba505ee44f4bc8bd61fd6df70cf45e65a8ebacd05d894bbf74208748c702528ba232d4c115ebe78a1c65e612
-DIST patch-5.15.96-rt61.patch.xz 77116 BLAKE2B e7ea7f89056ab1721f014c62750736915d3f06ba2952c387b656d35a050c60d28d74d26d5f115c6254fca6622cee25d9b3f2f88276867fb442c376c9a9aa8941 SHA512 e7de227787e35a0647c0865b2cc1c2969f3d01dbf96f7041e285ab1ca3332f1abd8bd58fba643b237b8c6576ea8e87a88971758d6b7a0d60aa68ac5968d03f45
-DIST patch-5.15.96.xz 3594200 BLAKE2B 390a5610f82f4f72986bc40efa4416c355cef1b63a1601bf7eb1797d3685052b0e23c5d6989338e0e7df759c29f1677e0655be58bf14dd641ecd45e8bb40fa24 SHA512 6330877a88d6d8e446cfcf8deb212a2221f3dec46c36dc5541c88fecea4714fef0822c64942a4669efce52530f2824d4d2dbd4bbd089f37654a864b3565202ca
+DIST patch-5.15.107-rt62.patch.xz 77116 BLAKE2B 6991e755081df47cd256b59db0380f2f168e6aab9e615c6d7f60ff0e4addb03cef960aaced89005719df5b8b4672e84ec54babc40c9563ffb5cdec7932366733 SHA512 d7a288cc7fc5ce6a97127e48e6dd27c2ef194827eac9af4da96d17806a3b0a96af6613d00dc732f9389e4799771f7d694b4e782c8163656b3280405477b59425
+DIST patch-5.15.107.xz 3867112 BLAKE2B 44ad474d664539d57e82bfabfc7bca05a15f43454d899880d65d09cbec1b40b2a30389ad7f5b35d78230f4d971e7223dc59bb1ae5a446522e03bdbdf1e2b3a9a SHA512 51570990fa1ab00fe9a7f2c08854236057a008f63bee51cf5c2bb16165f4a06944ec8b915412cbd21aa77eac324c03b431e201386dd6258f7367d9fc8ddd6734
 DIST patch-5.4.230-rt80.patch.xz 183116 BLAKE2B 4a28dfb2ac1cfa81a1d97a0b86e4ae7e47ed6e37b17926a8fccf87e9f3b43ad716b270cfbddd8db48e82ae5fa76b77f46f3506b63c004035b45c5b8935977d24 SHA512 124e0c99afb439d6c97596ea47a6ded73bf7bbc688bdeee9e7177cfc4f6c41985f2cbf9d0100e97b3db20a21735e76a3c09d29251fbdf54f8862498c63ae5e9d
 DIST patch-5.4.230.xz 4519916 BLAKE2B a88f386ba71ce0d9972154644c7ec46b10f20fbf1760f1a7ca73afdd2e424985156f127974758bf4870647f53b9c341d56b625f56c51f584ab4156f0dc5e6522 SHA512 8686631fc84aa7f6650051cd3cfebec4059ef54f53a5f86c09d61129c67615a433daf5b443462b10bb93965cf945c6c3e431ec080c96388aff2626abef6f36f3
 DIST patch-6.0.5-rt14.patch.xz 59916 BLAKE2B be06477b7733cb280bbb8ab1cc2b4c611d5b133d97e2459877a8aac0c82a6fa74cba7a7640b49ba6dd9d0abd61a9f9682affb032a8b9f0097874fff35fea9b71 SHA512 3e36e45f16499ddbd7029723363ff4cf6e7cd9503ba49f9ce0dbb960b34855c8411abccd32838f9f162412b4a1749f676432e463fce8066496f256313c99d79e
@@ -34,7 +34,7 @@ EBUILD rt-sources-4.14.311_p146.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05
 EBUILD rt-sources-4.19.277_p122.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-4.9.327_p197.ebuild 1422 BLAKE2B 78b1bfe2ddf38279cb8d714b80f8123db0cd5fcb4626cc5a60550ce1a9573631bfeb71de9018c9609efa95a29971fbd73e00217ad2b56a840efc6391bf045b04 SHA512 00aa2b9086b99ff329ff856457aef5cf6d366533b72ecd85aeba4d6b29afe19c986d17c12e4d40edbdbce52a992eb619bd5fbb6019519d2a192d7c31eac1d308
 EBUILD rt-sources-5.10.176_p86.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
-EBUILD rt-sources-5.15.96_p61.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
+EBUILD rt-sources-5.15.107_p62.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
 EBUILD rt-sources-5.4.230_p80.ebuild 1422 BLAKE2B fce4ffdda967dff1564cd13c9b05cf198b3dbc8af655bd1798e2bafe04fa4fa9136b9b0a8c45520e7d94a9b8391f2e8f1264172bf73eb460c6403efc2490b10c SHA512 f333ad7f5a2cb12941bc11027b6a8ce7765e9288cf35bed7e22ee47aebbc13a84eb590e3d9f3196b387a8687a69d5b2b62fed3497d61ef0c0270d136e2a143b2
 EBUILD rt-sources-6.0.5_p14.ebuild 1440 BLAKE2B 3f21c1c4a224731b17de0ce5f62e3713f90e6df36e2e243fbff8308da8316737eedc275174771a8a6666adef069a74a3a6098e34868d0a99bb5d17526f7dd44a SHA512 c34766b92f4f8a8f16d17b63103cb2cca3cfc4d73d71b5284ff715a9759689dd289145bc5ddbaa62244f5e81db9959f54dd1c68effdda8d71dacb1636dec15b2
 EBUILD rt-sources-6.1.19_p8.ebuild 1440 BLAKE2B 748f625c56954717e0e7798829e9a31d48061582c3d10ad87efcb9b863d19856e2b86fbc9c99732445385c3844a11737964bc85075b8409eff0e3c8f21b29b14 SHA512 9cf1bdef0fafb9aaeda8456f53820aecae7f4bddc7135861815ff53e1b241c9d0e078007c4839202d54942247c66c528956e74fd21914f8e34de0ea4904c1fb3
diff --git a/sys-kernel/rt-sources/rt-sources-5.15.96_p61.ebuild b/sys-kernel/rt-sources/rt-sources-5.15.107_p62.ebuild
similarity index 100%
rename from sys-kernel/rt-sources/rt-sources-5.15.96_p61.ebuild
rename to sys-kernel/rt-sources/rt-sources-5.15.107_p62.ebuild
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 26e971061cde..c907bd74baf1 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,18 +5,18 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
-DIST patch-4.14.312.xz 5071200 BLAKE2B 4879c6f9106565c1ab1ccd7e9762ca23b394f5092ad24620d6c978a1ab9ee1c156b2b7bc63af46418de610534206eda127ac8d2602677d321b01820cc6e5dda5 SHA512 ef13cc9f0fd7cbeb048505dbd9088802cd71de5157aeff443f200dc36050ae897a271944e22ec9041fb7ea1c41019c781e3553ed93f88659fe5559d08867b174
-DIST patch-4.19.280.xz 5298824 BLAKE2B bfd7f3e73c1c34dc53501a1d4e1498c2a93d3cad07fb6703da1d2c0b819f96a1e3990b98909c9099816b0018a6006b07b48f0d5e1d38bf78b78868b32b93c3bd SHA512 968ddae5628e7a1f2b1260179586eef943fa664eac4b6b4945d49d93a5bf94ab0e8bca789cd545ed125c7caa0e0ea4441c8a5360b010cee39888092c7aade346
-DIST patch-5.10.177.xz 4534304 BLAKE2B 6ea36fa96baa0a8817e8dbc7320c0b4dd2c4db7351b639eb59d0e3d9e08e2e3d74759466d400a24398bec9cc883b69fa8cc30e0c06d20de5e5b341d125897861 SHA512 f89e01773bad7f4058ca45f5cbd8b62f74e538a48c446ee53ef5c40cba50d4baee4e6b919ad12577d7c92ca7e583f099e7b521ba6e712d4fab23cae959affa05
-DIST patch-5.15.107.xz 3867112 BLAKE2B 44ad474d664539d57e82bfabfc7bca05a15f43454d899880d65d09cbec1b40b2a30389ad7f5b35d78230f4d971e7223dc59bb1ae5a446522e03bdbdf1e2b3a9a SHA512 51570990fa1ab00fe9a7f2c08854236057a008f63bee51cf5c2bb16165f4a06944ec8b915412cbd21aa77eac324c03b431e201386dd6258f7367d9fc8ddd6734
-DIST patch-5.4.240.xz 4686632 BLAKE2B aa26ebe29f46dbfad708086e0220de1014e4c635c2de424e86dcaf4aa71f2c0ad3bd14339c53257fd803615458abb046579b83768e0dc10ca960989b09d889a2 SHA512 bd66bf40ea261c0e91960f31363d80c1d91ebacfdb604bf05d6911ecc126e91a4039b7a81c4bbfde9d1e2e834e62a5d130a6a4a770841f3de939fe36e311cd6d
-DIST patch-6.1.24.xz 1350744 BLAKE2B 1ade51b34dbad86afc7290b7680cd7af4be74d30d90a398e2fe53ede591b00c16be2501710584a3493b2d03e4b831850cf56d407ded620a9c4fdea42dd5f4560 SHA512 ece3143fc5b0df8aa500c769f052ec285ed350502df36d557edd6c24a79e986d90379fb37eff3ec5126b18be0f28beb02ead1cdc50d4b8e75677d95af1b3b69a
-DIST patch-6.2.11.xz 683356 BLAKE2B e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda SHA512 86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6
-EBUILD vanilla-sources-4.14.312.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-4.19.280.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.10.177.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.15.107.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-5.4.240.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
-EBUILD vanilla-sources-6.1.24.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
-EBUILD vanilla-sources-6.2.11.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+DIST patch-4.14.313.xz 5074660 BLAKE2B 117a4fd78dab2e21e4288f364713309ab45bc7fb6b74001aa48f7e92a5e09fe0b5f7c764e5d321e39bca48c01b455c7ffe96abfe213b9b843455f20479486e3b SHA512 70e3c8495c7c661d46b8feb631157af3da5330262de1d5b559be096ccea751f9b0c2835cae4dc80abb560429a8710338f6c2caec79dcde021fd60d917f2975a9
+DIST patch-4.19.281.xz 5305668 BLAKE2B 5fae2d71e107365cba7c8fc7ce5b70f283b2015789141341924c6f831f04fc644f6a7116dbc2cf7ad8d9a30c2ed37a01be035bb59186d8b27a5bbb1d802f0008 SHA512 bb87ad9aac392b6c55a840cf3ef13644c280b049e64965651fa4fd695c551464d33db1ceae6cd17eff666e14a6500dcdd168dca4027b32b627140632824cd837
+DIST patch-5.10.178.xz 4564264 BLAKE2B 726532a194b754424114fab861ea9c41113b6a65cf6c94a662263d295d71dfedb44b92831c34373ae5d1439b61e1063be5d802d59af25c99769c9e9a3facc3aa SHA512 4aa4c01b1c6007b0ef7375740022ea9e42c721419e742dabf26f5c968ff2bceaaaa76359b2738404c24c1e44bd71fefe6f358f38255a8ef99e647b8549486bf7
+DIST patch-5.15.108.xz 3901800 BLAKE2B 67a9e1fe4ef61041b5dfa6df6069a5cb276dc3ec24a4e31d6b4af10917dccad0aecd5ed43cbde8f2682684cc660fc3b351c5b20d84e823f17a9d1f7b74d91cad SHA512 e9046cfe52e1c9b1db81ab50417e79a8b44dd1b6f31745eb4d9985c246d660871b919aa53f3bf270c7c417f004bc51a23043111ad5cef9bbed46ac128dc13e90
+DIST patch-5.4.241.xz 4704880 BLAKE2B b264668dd1641cab0847f1b67392246d808ad59fdd1d41012721a8c0611418276693abe4cdc655d4c274916e955a873daa627e250656e72860df517b1ed67852 SHA512 2da4a40e3484daba2a76e3405b3dc5eb26ef31b402881ced356b2393f21709b8fd54866128b64fccd34d9459c4d7371ad36bb31e04c411950e4eab4ce9385f3e
+DIST patch-6.1.25.xz 1380440 BLAKE2B 32e534cfecb02d536df0dd5c30445c940a0d617b061d6ff67ecdc459d80668818c805b377544f78ed5c3c6da0df99c7f064d2464bfe7e00c2b3f2480de68723f SHA512 1bb1e3ce45b3e68ea23ef957ce31b62f4f1eb9d7825aef065a1cec67c8440c6caed2f2d036759e8cf9659be001711bc25ab53bb0dd34f8442d0a6a78c4da05e2
+DIST patch-6.2.12.xz 717304 BLAKE2B cac6c5b94062ab23030baf97c4a50b3ada89afc322de8e58a9ecb1b77b3686a5af62debe902b1b374c06c85d8ef09cd5bc61a7e5d82b47cda8cc5cc4446ddaef SHA512 fd16bf76aae8fd11a6600a8a46af31cfe501377288cde53157ca193706bcb504ad83fcdb69484f9fa213eb5e7ceca592eb4d8443c8ab393045a49a7cd51790ef
+EBUILD vanilla-sources-4.14.313.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-4.19.281.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.10.178.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.15.108.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-5.4.241.ebuild 432 BLAKE2B 231885066aa053aebef45736afd51c83480460ad089ca2ccbf40e9d610f10bf1e70d75cff9c0da9529c220f0715470fb28243753782740012f139f0d37ada94b SHA512 4c41937ff77fb3ea6887eb08406d381150ed3b8b5bb008ae5def527fce7288d89a9f7b803a5bb34ca147cefbfae5e71d3bc5f15b92f9ed4f49d875300fba60a9
+EBUILD vanilla-sources-6.1.25.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
+EBUILD vanilla-sources-6.2.12.ebuild 439 BLAKE2B cbc87f55813e90aed1096e41ce4845597dc379a363cdba59dd4bf455176814aea6d7bc66699ee16d6ffaf7bbf4de7351d4592df4f03049407ef4009fc06a8d2b SHA512 c8187b4946370840fbf77ce77844bc1c05f19ad8505e1e6604209a17798b3865f2c0bbe52e818da051d77256a72e01ea350652046f83fdda45e1bdb11816cca3
 MISC metadata.xml 340 BLAKE2B e283ab9d2ebb7212e3ba37850c93761f165b4697a2ee6dbf07a67ce907df8ec71b3290a411cb81af8d8d8869b7e45c572487d4d2667dc0a0971986f0f6d1aa8e SHA512 bd0f7f570230dd5bd9f6e270345a3ebc556eb2dbcd19b04e33b5c6df8d9e6735a6e23fe934b39d9ef130ab5e78c6fdd29d7a167cb8ee4ac8ce919c75cec7425c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.312.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.313.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.312.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.313.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.280.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.281.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.280.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.281.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.177.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.178.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.177.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.178.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.107.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.108.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.15.107.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.15.108.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.240.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.241.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.240.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.241.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.24.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.25.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-6.1.24.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-6.1.25.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.2.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.2.12.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-6.2.11.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-6.2.12.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 7c653bd2795f..16718acd12e0 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 9d0d80ea3e7f..69ba7bdf2c27 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -7,11 +7,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6526 BLAKE2B 371b7d7bfbcacce1c04cf039b15f49bf5c8fb7de0352c4f477b92d1efe0c70442770ec0c6b60572cf5877b5c14492328cf727b2aa5c1dea761eb909aa1e1df6c SHA512 ee1f054abb9954eedd5b098afb1eb741cd2d7b1b329ef66ed3f25f8ed050227a31925852e3d893b0a9913e2ef2ac34efe89c66c19b562c586f7c0352a10a5814
 EBUILD compiler-rt-sanitizers-15.0.7.ebuild 6578 BLAKE2B 79b9477f9f426c7e5ffc07fe9e2abc86ee568d8e081ac5e5e3da3e3e169920fe8c0ce34f9a8ac03a4389f27ecb0b0ff7f5cf91622d614e03300f17ea97d20859 SHA512 9d23f6974edbe69e5d9fa53a3885e8e44741b5e5d90b0e72c6d191b70827d1e590a7c5a3373bc4fb4945a50db0eea5e119baeaeea956c6d92bb087410ce919b0
 EBUILD compiler-rt-sanitizers-16.0.1.ebuild 6550 BLAKE2B a3d856b59f3ad6ce433952a31081576c91576e764119720cf9af44dd54a1813f9f08da03c26cab7a4d00e8b44852197588b14eb52826419b353b44c926cf37bf SHA512 509c25c720fb1f4e3664491f41b23242dd24ba541cc319680cea6e0dc01bebe929af943281fe03473f49fff369b3021cc6abb0d5e6b8b1fd7fabc071961cdaa6
-EBUILD compiler-rt-sanitizers-16.0.2.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
+EBUILD compiler-rt-sanitizers-16.0.2.ebuild 6550 BLAKE2B a3d856b59f3ad6ce433952a31081576c91576e764119720cf9af44dd54a1813f9f08da03c26cab7a4d00e8b44852197588b14eb52826419b353b44c926cf37bf SHA512 509c25c720fb1f4e3664491f41b23242dd24ba541cc319680cea6e0dc01bebe929af943281fe03473f49fff369b3021cc6abb0d5e6b8b1fd7fabc071961cdaa6
+EBUILD compiler-rt-sanitizers-16.0.3.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-17.0.0.9999.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-17.0.0_pre20230325.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
 EBUILD compiler-rt-sanitizers-17.0.0_pre20230414.ebuild 6248 BLAKE2B 8548074a3b572bc5b19e9a70ed91225678172cb43b71ad501811d3741367c56f1ffe0e1b528934f620e7d8a30bd1fc463ada54113bea16c322f1d821a8503756 SHA512 8825b15e4965e58365a96517831120e1d5c02130f83cc1150b7a107142782cee74830d3dc0234453291d0f487789cd005303d47269381ad45356e4fd779decf5
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.ebuild
new file mode 100644
index 000000000000..d7d5778a3c8c
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+		sys-libs/compiler-rt:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	if has_version -b ">=sys-libs/glibc-2.37"; then
+		# known failures with glibc-2.37
+		# https://github.com/llvm/llvm-project/issues/60678
+		rm test/dfsan/custom.cpp || die
+		rm test/dfsan/release_shadow_space.c || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.2.9999.ebuild
rename to sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.3.9999.ebuild
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b1a6340fca3e..e467cacc5be3 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,11 +7,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 56b00f1c57cdaf1cd6dd7f15e13c714461001c0c2fb25e565c1677745e3fe6e61714e2f037814fef3eb32ef6866d517c391cb5f63c852ed132d74b1b5b7ef393 SHA512 31cd40fe6c58a6a653d36e99586230c7686ccb2bcdfa1c8ead4331dec2fd8dc53afc2a1e9bdf165dc5b4f7580c8cd25bc7a68acfa9c881fd775187bd82e28f11
 EBUILD compiler-rt-15.0.7.ebuild 4260 BLAKE2B ae8a86217b480bab08dc99d4c5a648bf99a0ef91fb41233956b4a5d1b10d5ed6b3c14d9c02c43e2c0b11dd19f4773ca995c113e48b14475b95b7ee7b821a72d1 SHA512 79da724a1d2483af0dbcc792d008fe994c4fe075db31c7dfcc64192005427137f0157e81345a4027e5a8ba9104f662bc51bf492bca96e1b46c35a44a1849ab84
 EBUILD compiler-rt-16.0.1.ebuild 4244 BLAKE2B b4fa336d5147d1f452cfe2d423d86a7d3c61747c537c7ad6d3925c0f8cb375e63a7ca3a233504f246bba3e8571552ee575852ef9d14c4f7386078d89bbda0f90 SHA512 f41f64f6bce1331285993ce6542fca86ae5e8fbe6bf2ebbd7b5393fef8916125efb571d4272d64f25667592f04783992b43feb241d64d3186ceab38a686eb75d
-EBUILD compiler-rt-16.0.2.9999.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
+EBUILD compiler-rt-16.0.2.ebuild 4244 BLAKE2B b4fa336d5147d1f452cfe2d423d86a7d3c61747c537c7ad6d3925c0f8cb375e63a7ca3a233504f246bba3e8571552ee575852ef9d14c4f7386078d89bbda0f90 SHA512 f41f64f6bce1331285993ce6542fca86ae5e8fbe6bf2ebbd7b5393fef8916125efb571d4272d64f25667592f04783992b43feb241d64d3186ceab38a686eb75d
+EBUILD compiler-rt-16.0.3.9999.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
 EBUILD compiler-rt-17.0.0.9999.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
 EBUILD compiler-rt-17.0.0_pre20230325.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
 EBUILD compiler-rt-17.0.0_pre20230414.ebuild 4165 BLAKE2B 5c1747ed91de0ac5c023f933703fabc2e226f025f8794e09db976b941241c068bb0b241bf9ef6514f01ac2a5642556be7635ddc640710c106c1be10ad3d6241d SHA512 8b293590412b9781aac94517a9e3843d3d08eb20e125fbed48cd28b64acb1cf41087084f652c0e01921ee90509ee2fc3f9ff1a7c6cf6958e82859005559e2573
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.2.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.2.ebuild
new file mode 100644
index 000000000000..49b92c7f0e51
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-16.0.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="${LLVM_MAJOR}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		if ! tc-is-clang ; then
+			local -x CC=${CHOST}-clang
+			local -x CXX=${CHOST}-clang++
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if ! test_compiler; then
+		local nolib_flags=( -nodefaultlibs -lc )
+
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
+			# Avoiding -nostartfiles earlier on for bug #862540,
+			# and set available entry symbol for bug #862798.
+			nolib_flags+=( -nostartfiles -emain )
+
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-16.0.2.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/compiler-rt/compiler-rt-16.0.2.9999.ebuild
rename to sys-libs/compiler-rt/compiler-rt-16.0.3.9999.ebuild
diff --git a/sys-libs/cracklib/Manifest b/sys-libs/cracklib/Manifest
index 589772ad365e..77431fdc3cd9 100644
--- a/sys-libs/cracklib/Manifest
+++ b/sys-libs/cracklib/Manifest
@@ -2,7 +2,7 @@ AUX cracklib-2.9.10-python-inc.patch 712 BLAKE2B 2e5d1dd7637632d25c408232dac7722
 DIST cracklib-2.9.10.tar.bz2 620648 BLAKE2B f4ebf4aea6da81424a8b9fae9c204260f6020937b6b2b02cec13527f812e1751522a47a4432ff0a2a233eeb88fe0c8b7e7fd371f611a40bf2d34a10ddfd4fe83 SHA512 0c3856833f4c58fc1ebc63cc08b189c55e8d5722ef8cdc1cad5f717cef137a83648657e005e2d0367006b27aafa1bb63e36e7998918937733816635880c85f74
 DIST cracklib-2.9.11.tar.xz 461116 BLAKE2B 46b499e465c1c268b772781a9c8ce573a5167ae2e0ac919b403acdb9a14c35140dfb53909eef6e41600e26c2f87d905b3d6d05380c66f053d091765b58a264f4 SHA512 c32e509f757344a1f0b7032ad3b6dc47a8759852a94e511c92073d85bce55f45d48c389d9eb34c993e1d61ad5c1542150672f3e8bc147148ebbb04d3319a2409
 DIST cracklib-2.9.8.tar.bz2 613017 BLAKE2B d9a5d922d6ac777b08cec9c427c0cde48666cdf67bf4136eb5866a0111b101c795dceb8e206e90bff31d1c8d26505bc1a950e8ea079562d8afd601641a7caf0c SHA512 bba1b82067156f44095b282c70c06a05e58572cde7ad2430dd24c4b42ae98be86708ea86ba8b7104aa5887e16ac90d7cf3ae613b84ab9c0f7602307d78b75371
-EBUILD cracklib-2.9.10-r1.ebuild 3032 BLAKE2B e408bf8549fffc5a617cc2e4b6ca949e84f52b1d45330f1d075b4d4cad781dbf32df186b39c7e62c5e92825b18c5404763d9bcfef9aa9b68c4f167e13a365a82 SHA512 be576eae3cc42876c80ef64716a1e7c26e08c63b46e154774b08ec0451094c0bbd1a426dfbf6e7ae00a34e030f83efaacaa1abca88f158557c3df8bb00cd40a2
+EBUILD cracklib-2.9.10-r1.ebuild 3024 BLAKE2B d7eefb1fbb881bae3e03c5ea965bb30a2351818031e2cec2377af3a5efebd9331851738e15d51d166db2baf894aa0dd2e629e921252091640a59cf0ac7e48798 SHA512 4097d63d975ff66648b79e11f582df57f2da06ecf8465aa4c6f93a91a38505915d06417775208d968cc3dee4a314664b9e043991e15598df912289a9a00312c0
 EBUILD cracklib-2.9.11.ebuild 2973 BLAKE2B 209b9bf5f1d0a75cde91d38fed36a774398fc023ab739bb08a0d4b9958fc82742e932dec534640239486374d632fc970ce99682d6b659751bd89a0351d82ef3f SHA512 55edd6c99c1329b2e1f05f4df2964b87cf74754914829ea25c2cd7aa0a40371584f420301dc7d6683c234ea263f95dafdf9d64bbc58750d567a4d89d881a63b7
 EBUILD cracklib-2.9.8.ebuild 2672 BLAKE2B 88614b0d1a368daaf22b2249ab50f8f4fb0c03d249ecc8b700a0e8800128c21e2224d437040c43886c620ca2224c2bc97aa2c24a58a7bea095cf4f29c8aed5aa SHA512 6b265982b4405a42f0581511432942f37f6ecbe1136f9cd7d40eb4f142810b3f2b4a38b477378bc748b8483f86bbdf846d5d55f4375b1b903b74689a6d815e69
 MISC metadata.xml 385 BLAKE2B f81e1ac44f5a4c3f647473385363eed564accca3b62ecde3cb35fab14112af1ceb2a25dc2816fc096aee9c3ed15006252f32491583861689ed70d49218684360 SHA512 6d9908f12c310ef22feeae2216236f9b632dc5204916fbb5693cc53bb58e592dc44f49c45d2c8bc22addd69cc5e4e63df463a23299d09a637f4f0f7379e7b796
diff --git a/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
index 0553dfd808a8..aaff1f1b5172 100644
--- a/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.10-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="nls python static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 679fba07e495..b8b42f6b7b6c 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,12 +7,15 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD libcxx-14.0.6.ebuild 6949 BLAKE2B 963ece6dbc81f876b8894dd2be0ab4fd5e555dcd09feaf014e30411150f43c9f401910741ded4ecaa05d35f0a2bcf3eb7ce519d4019f464075c31db0c9b6523c SHA512 4c73189a6b719bb10527000b30b83c8811aa462d51bc51bd5b2ff703184e01d8805f0b998479116a39e878ef7486c14e2bfef62bd62b1a20718906eb778a0228
 EBUILD libcxx-15.0.7-r1.ebuild 5307 BLAKE2B 43ff3b320e3050127edf77b51afdb77f25c1dc8826c6b29e8a72f809479df78c661aa2882e6fa9459dd360b379d2a6bbd31d910942d40e49199feafa807a6f4a SHA512 be7372fa0a81a45a55e5896ca507e6a4c29e14f4f152154f43529fcb12c8a96ca0c620b432c1481e8c41bb588d4d3f3c479fb9c7ba2483e53881ffcd9ca7004e
 EBUILD libcxx-15.0.7.ebuild 5282 BLAKE2B 9c1dc8c9ac37ecad2c31231d04068fc60d29df72a393e507e46f12dc093ef11f475ca3df2806551450ea37372dd6739b58b68e7b65290e4ffc18b6fb6085f319 SHA512 f068764ad081f16471f1c3f126095bb5fc61f6151327e50fb6724c93ab33906c72f763b848cb6b0a25b532344a3b6d2b100ed070a6c8bcb7d2e9a4d43e128957
 EBUILD libcxx-16.0.1.ebuild 5294 BLAKE2B 83f9a04af5773a5dcf9f0ba430684e2527695b9b41b8f704a779abb2a9e74060c8450e888f0ccc89bd5befdb32a93706ad2cb82ba309792a1f79297d8a9315d9 SHA512 deed56905f464c6b0baca63585753dbf8975fd2db72493ff8adda9a4ed8cdcb4ca3ef7fcdea6227d6680dca949963f438aaa36947e9045e98a582813eec4defc
-EBUILD libcxx-16.0.2.9999.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
+EBUILD libcxx-16.0.2.ebuild 5294 BLAKE2B 83f9a04af5773a5dcf9f0ba430684e2527695b9b41b8f704a779abb2a9e74060c8450e888f0ccc89bd5befdb32a93706ad2cb82ba309792a1f79297d8a9315d9 SHA512 deed56905f464c6b0baca63585753dbf8975fd2db72493ff8adda9a4ed8cdcb4ca3ef7fcdea6227d6680dca949963f438aaa36947e9045e98a582813eec4defc
+EBUILD libcxx-16.0.3.9999.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
 EBUILD libcxx-17.0.0.9999.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
 EBUILD libcxx-17.0.0_pre20230325.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
 EBUILD libcxx-17.0.0_pre20230414.ebuild 5239 BLAKE2B 397730a8caf3ca40b19225c6742bc885608d0ed93b04857992564c5040d2bc2196718b0372b497289616d1b334fca9b5e48b1a87604618a4435570df67bf2db0 SHA512 0f6d63282362faf2e845d65ec7f027d38d4d7fc84bfcb4302951cfe279504742f28404da2286f9c5a7439f56a07c20912bfad9d43a42b5a17e9a8b141b06805b
diff --git a/sys-libs/libcxx/libcxx-16.0.2.ebuild b/sys-libs/libcxx/libcxx-16.0.2.ebuild
new file mode 100644
index 000000000000..cdbee6be92d6
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-16.0.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang +libcxxabi static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		sys-devel/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+multilib_src_install() {
+	cmake_src_install
+	# since we've replaced libc++.{a,so} with ldscripts, now we have to
+	# install the extra symlinks
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		dolib.so lib/libc++_shared.so
+		use static-libs && dolib.a lib/libc++_static.a
+	fi
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_static}.a || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps=(
+		libc++_static.a
+		$(usex libcxxabi libc++abi.a libsupc++.a)
+	)
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=( libpthread.a libdl.a )
+
+	gen_ldscript "${deps[*]}" > lib/libc++.a || die
+}
+
+gen_shared_ldscript() {
+	# Move it first.
+	mv lib/libc++{,_shared}.so || die
+	local deps=(
+		libc++_shared.so
+		# libsupc++ doesn't have a shared version
+		$(usex libcxxabi libc++abi.so libsupc++.a)
+	)
+
+	gen_ldscript "${deps[*]}" > lib/libc++.so || die
+}
diff --git a/sys-libs/libcxx/libcxx-16.0.2.9999.ebuild b/sys-libs/libcxx/libcxx-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/libcxx/libcxx-16.0.2.9999.ebuild
rename to sys-libs/libcxx/libcxx-16.0.3.9999.ebuild
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index ed6da4177edc..9bd6f14bb820 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD libcxxabi-14.0.6.ebuild 3385 BLAKE2B 4de1316298a9ca1fab72d50484e01346b51a9d14eade701ebcb65100984a63b5bbf3cbea8640dc30e665539cf4af4edd5e1cf4efe7761c6e7cd050ba3d82c3ec SHA512 e23fbcd217ab40c2250bb4ab1fbd7845f9619d0333d2177b20051f9fded815c6b49f806201bf8a023db71287ec73c7ba6b4fa85a1256bef8c7861a2a4f480c31
 EBUILD libcxxabi-15.0.7.ebuild 2910 BLAKE2B 0384b9de395b7725422b07d31439af21c120173a2fa24393bf81e6c150b28977368234aa9f602bafcd46126e9f325cf9314b1f8ed26f1baedcfcda8102240cf7 SHA512 1e0114e9236fb02037229aaf03f736efc0bf8362c1aaa8353b527693b1759ca228cbaf783ada136129b221b464bf341fb54be825f9f5d405212554022de524c1
 EBUILD libcxxabi-16.0.1.ebuild 2922 BLAKE2B deb13575bf9827c2e53b9e9d6179c4cb1db4f6e2a2ab63455a6170883f10c2a2acffd82089e4465f3b07794d16bd81f58edc675a9b5a14a0d3423cc1854b4c57 SHA512 46352684087b70b767fa241510318432491f9aad1f9ea83059093f2ed7af8d61e24884a4958f7008f27ef6735de109084b3b28c8f83db31b6f0cd2830f9480e6
-EBUILD libcxxabi-16.0.2.9999.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
+EBUILD libcxxabi-16.0.2.ebuild 2922 BLAKE2B deb13575bf9827c2e53b9e9d6179c4cb1db4f6e2a2ab63455a6170883f10c2a2acffd82089e4465f3b07794d16bd81f58edc675a9b5a14a0d3423cc1854b4c57 SHA512 46352684087b70b767fa241510318432491f9aad1f9ea83059093f2ed7af8d61e24884a4958f7008f27ef6735de109084b3b28c8f83db31b6f0cd2830f9480e6
+EBUILD libcxxabi-16.0.3.9999.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
 EBUILD libcxxabi-17.0.0.9999.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
 EBUILD libcxxabi-17.0.0_pre20230325.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
 EBUILD libcxxabi-17.0.0_pre20230414.ebuild 2867 BLAKE2B 1565024272821f5db0817703d3c344ef2286c0f8cfd09756a9b9ee75482cb89b618b302162bb1cd6b9a4fab3d5e716853fef94015d254a44bd282c50b2b945cc SHA512 b7d17ef8afb5d4415377a9f2b4c9e6a0defec0262c5c8d730036a1c25e8eb2c8fa79c3d67adef58f33b905d43b80d61934dccf1121b7d0669d6e14905655f421
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.2.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.2.ebuild
new file mode 100644
index 000000000000..e5d488bf1341
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-16.0.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+	!<sys-libs/libcxx-15
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
+		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.2.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/libcxxabi/libcxxabi-16.0.2.9999.ebuild
rename to sys-libs/libcxxabi/libcxxabi-16.0.3.9999.ebuild
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index cf338b2b74ae..6842ce075eb6 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,11 +7,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.7-r2.ebuild 3474 BLAKE2B c75fddce61b7e8fe837b4c5bc1b7dacfbe4bc1572537dd7c44c23f894d05b104e8946d896b3b19d78de32a87d866d5911a0f3a8f81796469bba2753d051b2105 SHA512 7dc7c5fd7cd370acadfdf6e15ed09cde0798312ed3c72e770596aecb5817a4ec1477cc1092e3c159d1988bba4200808259705206f80d8fd0019fe07c34f4455d
 EBUILD libomp-16.0.1.ebuild 3993 BLAKE2B 12ea9bf058a78f1a4439ee65528a592b0fed0a1234e3c318a748f9bf8e520763c7ffda28719f00abbb01fb1a77798f1094ed48fc344d1ea12999a0bbe60a8675 SHA512 b517da1c7c983f21969377852743b5015f6ea86ec078f330d100c8a5bc39de6ee0aa488a15f1702ea765a958ec9ea8903226d81a3ba154273cfa8a5e615cb3b5
-EBUILD libomp-16.0.2.9999.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
+EBUILD libomp-16.0.2.ebuild 3993 BLAKE2B 12ea9bf058a78f1a4439ee65528a592b0fed0a1234e3c318a748f9bf8e520763c7ffda28719f00abbb01fb1a77798f1094ed48fc344d1ea12999a0bbe60a8675 SHA512 b517da1c7c983f21969377852743b5015f6ea86ec078f330d100c8a5bc39de6ee0aa488a15f1702ea765a958ec9ea8903226d81a3ba154273cfa8a5e615cb3b5
+EBUILD libomp-16.0.3.9999.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
 EBUILD libomp-17.0.0.9999.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
 EBUILD libomp-17.0.0_pre20230325.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
 EBUILD libomp-17.0.0_pre20230414.ebuild 3920 BLAKE2B f128f041db9ab95beed986fad4fce1d70d30688dff973aa15a1ffb268f248ade667da316effe8de491d836bebc289a30a691910d1159c7a2563cbaad42f1bfbc SHA512 56a8a37f77c4690041fa9d274b3b52a5cc41588e02961b157f078adafe882bf66957d4d729037baf25f1257a0cb2af5f83e432c2d214234cf6942bf31eb7bd9d
diff --git a/sys-libs/libomp/libomp-16.0.2.ebuild b/sys-libs/libomp/libomp-16.0.2.ebuild
new file mode 100644
index 000000000000..72038b861daa
--- /dev/null
+++ b/sys-libs/libomp/libomp-16.0.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0/${LLVM_SOABI}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	debug gdb-plugin hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+REQUIRED_USE="
+	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gdb-plugin? ( ${PYTHON_DEPS} )
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	offload? (
+		llvm_targets_AMDGPU? ( sys-devel/clang )
+		llvm_targets_NVPTX? ( sys-devel/clang )
+		virtual/pkgconfig
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lit[${PYTHON_USEDEP}]
+		')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp cmake llvm/include )
+llvm.org_set_globals
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	if use gdb-plugin || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+multilib_src_configure() {
+	# LTO causes issues in other packages building, #870127
+	filter-lto
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local build_omptarget=OFF
+	# upstream disallows building libomptarget when sizeof(void*) != 8
+	if use offload &&
+		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
+		<<-EOF &>/dev/null
+			int test[sizeof(void *) == 8 ? 1 : -1];
+		EOF
+	then
+		build_omptarget=ON
+	fi
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+		# prevent trying to access the GPU
+		-DLIBOMPTARGET_AMDGPU_ARCH=LIBOMPTARGET_AMDGPU_ARCH-NOTFOUND
+	)
+
+	if [[ ${build_omptarget} == ON ]]; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
+			)
+		else
+			mycmakeargs+=(
+				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
+				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/libomp/libomp-16.0.2.9999.ebuild b/sys-libs/libomp/libomp-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/libomp/libomp-16.0.2.9999.ebuild
rename to sys-libs/libomp/libomp-16.0.3.9999.ebuild
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 63784628ba23..8752456df426 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,11 +5,14 @@ DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5 SHA512 98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094 SHA512 f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
+DIST llvm-project-16.0.2.src.tar.xz 117995768 BLAKE2B b329b2b123428f3a966a96f074a75520f07d12fc13ec755403cff2346b23195e6a0c05ca9e789b4cf5b4b3557a922bd41d8dffb6056ee33fbbf2b81001511fae SHA512 4ca76aaaca8812a06a94071e7444a3213d85dca51ea86f6125f854776f69a3e088a92d0621e3911e526f280b35bfb778fb3742c6010d3ed1eba605c08720377c
+DIST llvm-project-16.0.2.src.tar.xz.sig 566 BLAKE2B 8243748ac27e4eec3cc011371e179e19f1005336f07d956fd358f649d1429c8d0ea22ecc376b1dec9fe3db971467ad1dd63e97bb089885d0e1994eeab26b6fd7 SHA512 dbe9367a259954a38f2369b2f226726162090227f1a5ae8c8809eaae47cad7b3b26c754633e6e5c54cacd6360a504d7ba4c659d9232c1648388d657a2aaad10c
 DIST llvm-project-5c60a08c696c0420ddc5fdad5b8e50a7528cb3bf.tar.gz 182291041 BLAKE2B f5997611e0293df515d4494d14895cc8fbe22b536f5c419e4ad7d098acbf2b1046ceb332d865eacdae0b7fa1a77b78090551976835dd1b95b5270c9f6e12e410 SHA512 6cda8e55b4fc70e94838c772c56213c811affda96fb98a03d432348f995a313447d0e0e84533350e1fda3162d82633b260ccd8e3b1d59d3216187b44dc5556fb
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B ba7b19ed2bc77b52eee0b04d938541d2eb4053b65a641e55e54ebac85adcd432fa60b2b484003890bc96be83d61410bb58c2f3a86f12a7c574044a8e10427db9 SHA512 11854f9ef2a552a96e51c618958e553d4cd4affc78312845a223d0fe6d2ff62e8f8b2b3c29ad4a093b08a6df63b230f21b9ef6b63440058322f6a00f160df3e4
 EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb
 EBUILD llvm-libunwind-16.0.1.ebuild 3045 BLAKE2B e0704cc1c6a743ecd3c073df9456f7a549896a9992083ee650803f199d4285a7666fc819245fe3e5762046d8df875291283059033287b9e1f9d71345e86a20a2 SHA512 4da2d464da0d7f438e782bbb539c394588c046af0c1415718ffa2e43e6500eaa60aedefe58b814281c41873a4ebae8b01f5299798583e9662a347a95ed5a5e69
-EBUILD llvm-libunwind-16.0.2.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
+EBUILD llvm-libunwind-16.0.2.ebuild 3045 BLAKE2B e0704cc1c6a743ecd3c073df9456f7a549896a9992083ee650803f199d4285a7666fc819245fe3e5762046d8df875291283059033287b9e1f9d71345e86a20a2 SHA512 4da2d464da0d7f438e782bbb539c394588c046af0c1415718ffa2e43e6500eaa60aedefe58b814281c41873a4ebae8b01f5299798583e9662a347a95ed5a5e69
+EBUILD llvm-libunwind-16.0.3.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-17.0.0.9999.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-17.0.0_pre20230325.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
 EBUILD llvm-libunwind-17.0.0_pre20230414.ebuild 2978 BLAKE2B 9143fac20e5d73511c56e8015c4758075bf62329b64428b9244812f2fe5fa32772c9ad29e3e7beb1aaa2ff3ef70ee69f9673c0becf7df09f4e2fc5d348c03512 SHA512 b790b15702e2ba0367c771d58dfe975f7b97bb6a90acca97d1180b1b3ba44893575bc92ee1cfe037c308b3191f3d1b8309a0a658cd8617b0993bfa8ce4630d97
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.ebuild
new file mode 100644
index 000000000000..049f6bc1cc17
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="+clang debug static-libs test"
+REQUIRED_USE="test? ( clang )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+DEPEND="
+	sys-devel/llvm:${LLVM_MAJOR}
+"
+BDEPEND="
+	clang? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	# https://github.com/llvm/llvm-project/issues/56825
+	# also separately bug #863917
+	filter-lto
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	local use_compiler_rt=OFF
+	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
+
+	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-16.0.3.9999.ebuild
similarity index 100%
rename from sys-libs/llvm-libunwind/llvm-libunwind-16.0.2.9999.ebuild
rename to sys-libs/llvm-libunwind/llvm-libunwind-16.0.3.9999.ebuild
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 4a18299b071f..4a2c2ccf6c1b 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -143,14 +143,18 @@ DIST ncurses-6.4-20230408.patch.gz 15680 BLAKE2B 7d1fa16a79e317be3c2746f7117559a
 DIST ncurses-6.4-20230408.patch.gz.asc 729 BLAKE2B 7648e24297dc66dc4d5f08bf592b2db628a5962b0d6d34c1f0725257c3a04d2430897edd99d741ba837196e9a6f2c138e4826f40f80ea88e9d5dc04a41c11986 SHA512 eabe6e49b94969fbba7bf8de3bef803a8151e6d3bb0e9d1f0d4b11d27c7156be37f623e6785a205b7b8acaef2a2d646099aef8c410a6addb7592a9af2ec930c4
 DIST ncurses-6.4-20230415.patch.gz 23979 BLAKE2B d89402d39bd71e23021d1ad28a27965239409b8d29397a9a9f3172178dd060cc42f736224b6438e7048cd05f38c24e4d229f83fc87fc207d5d2cb3b9577e1bcc SHA512 63a6368745c2c418fa263cec4da69a06e981fb8cb466f0694163fd324ef328251acb38ca3ace02f18b8b6b44dcaf414f74335a2239ae7af2b0c8ed916ca6644d
 DIST ncurses-6.4-20230415.patch.gz.asc 729 BLAKE2B c7ad19d4ae544c64eed538e7c6fd03959988e80140cbc185c6eebb932d026fa316df1d53f9e049e82fec811860e3a0a32b6af76f980fe1603684ce2678dd4fd9 SHA512 4637e09e4620da328d163bdd100756760b0f5469304ef7963a93346d263039ea608fd510fba0079feb094a37fa857b7fcdcb938d2ff5d93aa809cb9c74cf4d5b
+DIST ncurses-6.4-20230418.patch.gz 32130 BLAKE2B 912efedd3a615ce383b09218031ffc49f87e0bfc7fe8aec37330394b9235fd61337fa707898c308cbfd7426fc6f06b3639e533138ca390d42139583c58ac06c0 SHA512 4952d56a3fd54be512dcfabe48d967af43c7c51b9e49fbdf575301861940f00fd5e88b994a2088baf4a0e551338b978e47c6ac232bc9ae4e8ee417bd17405288
+DIST ncurses-6.4-20230418.patch.gz.asc 729 BLAKE2B 59d8ca3ab665e1bbfa7a1602b2856de79289c42eda33f8f517f419e41f7eebd57dbcfd73c292d6a2debd08f02cb39a6b6b47b389a15b1ab845a5fd4b4f73432f SHA512 d8be7ff7c1ba083f1c7e10dcb9fd88d7be661201534922d1a136e24081767702b6cac897a3cf5b7d96bc65687690998e4a9a3c57ed39a146df5d6be95080704f
 DIST ncurses-6.4-patches.tar.xz 63720 BLAKE2B 6b767f65a9c7e8f9fdebaa2623e3770872e710fa103d11e48509e5315ebf5ad1a37519b1b40c5138e631693fb2e2e30ea5eef11002698a341a623a85c5b0b4fc SHA512 5094f6cb8fa54d9df0802173f1e0ff2ad40fc3d4bd298c0742479f72ba4f9afee0ccf9f0a4eb068b0a5552523abf7b212861b61abbde6f69ff22d62dd686daa9
 DIST ncurses-6.4.tar.gz 3612591 BLAKE2B 47fd9c2d27f44fa9942552881a471e5067465dbace40bf68b28998dded0556127a1d8662b96de4de4fd76c1c8b98bdae796036553ab4b05ca9f160839d841ba3 SHA512 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 DIST ncurses-6.4.tar.gz.sig 438 BLAKE2B e6a78b8d0cbce1577205b49b0260394094632cefd95294813c7e4e51a2908e8599a9f24b3b648e42ba16c015fb9424b2a82236f58aac3bf96f5400a50482e44e SHA512 f2a7859725b4d5d62f68006338d56598ac6b38a1448983108906e192f0ec922be287cc89bcc79c1ae49ebc80c967af3dd077427f35ae579b00d445c882414fed
 DIST ncurses-6.4_p20230408-patches.tar.xz 80472 BLAKE2B 0ba8156ebd4f1691fec7bc1b800ef39ce6a4210573c027dd437919cdcd7c995830116da06c69f31c65923845a4d5c88e974673fac38acce5813f7d6cdc646e3e SHA512 32960e2cc4cd9dc60c38b49f46c5ce2c02179479abb66ca29f63cd06475ae8e26299a78b5f06762d114aefbbca3ba6fbebe7093a58106eeaa40cf500d21633a4
 DIST ncurses-6.4_p20230415-patches.tar.xz 63188 BLAKE2B 2f05eb332a2af69bb5418026ef9fdfcfc6b164c20ad7618c481127054b653ab5961a8a96cd7dbce653631ae8a1afc9377c4a82b4ff8aff27bb47f21fbead48a8 SHA512 a052004fb8dd2653b12f0ee6b9d423fdedc77a049c67e7f34794aad9f249bbcb8439cf9d15647911583895c7a579f1b4c887fa884a699e74e7ea24861566eb6f
+DIST ncurses-6.4_p20230418-patches.tar.xz 63200 BLAKE2B 07328d1e998bcde6cbad46550f3d563632963483d72c624a9b64e6e07d80b61f1ab28bee486aeb7cae7d966892762c4aec8ecc504df3f01d5dda49825c9e9693 SHA512 1bcbf9d14d5c693309f79f83c2f85c02cdd40e4de057e6efb5451feed49265d1b8d0bf672e2afae773e68b32a49911c5036ed3f74d9a0089b7b6b03f53fb0b47
 EBUILD ncurses-6.3_p20221203-r2.ebuild 13942 BLAKE2B 8d7b3769d860b133ad0424968417211236330c1c52fe9de430515b46bf93f3a6464af9265acf2fdb78589f670ecd77c35f09121bfd022234be61b37a8883da33 SHA512 05f9634de9ae52baed8fff3c952ab29fce9470eb28069cf045ef6c9ba610955b806f18c5cc6e1b583b8bcb4b250e322c136f3a89d0c775a805ffa93c64085494
 EBUILD ncurses-6.4.ebuild 13184 BLAKE2B 0f3688fdbfbeff0db2e9dc42b32d524ab1e129fb2261781b7b698fc360800ef82158bbf3b90e6dc1f970ffc1c114cba1548f2faa258b5a47eeb6328ff6089a6f SHA512 573d98ed4127b8d68ff32844a3600a46390395c362405d987875b5628fb4b838b49b7a575dcee76a821e1b698accfdb1991b498985afc02543192a6becd5a9f4
 EBUILD ncurses-6.4_p20230401.ebuild 13269 BLAKE2B 037204d7c8fa13f14e5d67b6c80ad250f80752dd7e6ea3ea99ed13976532787a93d3a6bb306274e778ad660e0b6ab8ab91d6b9fb8e033dbce675c5e8ac29aa8a SHA512 c00016ce74095c54f51e680b1f7c20d6c95a7083c52d0066e5cc283ed2ef520f499a6b396a76916fae39a3ea8088fdef870aa58bc9e9cf9033d06a69aa87d3bb
 EBUILD ncurses-6.4_p20230408.ebuild 13280 BLAKE2B c915f5d63ab49e4f6bbac7877b831d93513511db8d4c2a6789fa6346188ad44e1c166459e9eed8962c52b3bfe6f3095bf24c44f192f0c9bc5d467f6dd163816a SHA512 067d5b90e423d54ca665ddb3dcbf86d863331a2431935f8fb2949d69b725ddcd009b2dee46cbd980feffe1f488eb800f2cfee39b51840f27a48a5c0caf254e6c
 EBUILD ncurses-6.4_p20230415.ebuild 13291 BLAKE2B d02fa20b7028d8dca2a713d578a885bf0b474fb00babcb55322a41b67a4184f49996de1fac6067150077f1ce814f93f7ecfc1e5e8aa365028b08647b6e54e514 SHA512 d0b5c21c3284ecc6b377efdfbd2cad63880dfe95c39e21ac1ede965f3e5112ef39d01f4fd9d1946f154a22c6633c589612132dcb906e39e9e652509b2d72fecc
+EBUILD ncurses-6.4_p20230418.ebuild 13302 BLAKE2B 9b2fd80914bc8b35424a608190ccfc09b6f6bbddff056249df554924f0c8670d727947924a433181b9d42470d9c410828bd02b5e2dea8a1fd8eb0cc2e1a33cc0 SHA512 ecd32b3ad1296d4b4b28f7f76fa4c1f620cb442daabedcd26bdde5693cbd47bb56a102e2c61f108369eeb71c6b31bdc2ef09c8b44f4d86f63a44fff67b120123
 MISC metadata.xml 1094 BLAKE2B a65bbb9584f77fb07fff735e6471ef48a5d63e7fa79112bf75df67f2f94e816706165fdd42a482708a7fd2ab3b3e308f9766eac0b39c3a4e31dcff5b3db25d57 SHA512 adf0f939a1e14c964bfb44ab80b1b8c1ee897a036a994848ba3e40280ab3a73ddb3beef540c905efd623e71b890c4c91e0b7c24651561d0e2bb2a4c86f039dba
diff --git a/sys-libs/ncurses/ncurses-6.4_p20230418.ebuild b/sys-libs/ncurses/ncurses-6.4_p20230418.ebuild
new file mode 100644
index 000000000000..5f14d9f41b1a
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.4_p20230418.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/"
+# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net
+SRC_URI="
+	mirror://gnu/ncurses/${MY_P}.tar.gz
+	https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz
+	https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz
+	verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig )
+"
+
+GENTOO_PATCH_DEV=sam
+GENTOO_PATCH_PV=6.4_p20230418
+GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches
+
+# Populated below in a loop. Do not add patches manually here.
+UPSTREAM_PATCHES=()
+
+if [[ ${PV} == *_p* ]] ; then
+	# Sometimes, after releases, there's no megapatch available yet.
+	#
+	# From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/:
+	#
+	#	"At times (generally to mark a relatively stable point), I create a rollup
+	#	patch, which consists of all changes from the release through the current date."
+	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
+	# This array should contain a list of all the snapshots since the last
+	# release if there's no megapatch available yet.
+	PATCH_DATES=(
+		20230107
+		20230114
+		20230121
+		20230128
+		20230211
+		20230218
+		20230225
+		20230311
+		20230401
+		20230408
+		20230415
+
+		# Latest patch is just _pN = $(ver_cut 4)
+		$(ver_cut 4)
+	)
+
+	if [[ -z ${PATCH_DATES[@]} ]] ; then
+		SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz"
+		SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${P/_p/-}.patch.sh.gz.asc"
+
+		# If we have a rollup patch, use that instead of the individual ones.
+		UPSTREAM_PATCHES+=( "${WORKDIR}"/${P/_p/-}-patch.sh )
+	else
+		patch_url=
+		my_patch_index=
+
+		# We keep a bunch of mirrors here as we've had reports of invisible*.net
+		# being 403 forbidden for some users.
+		urls=(
+			"https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
+			"https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-%s"
+			"https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${MY_P}-%s"
+		)
+
+		for ((my_patch_index=0; my_patch_index < "${#PATCH_DATES[@]}"; my_patch_index++)); do
+			for url in "${urls[@]}" ; do
+				patch_url="$(printf ${urls} ${PATCH_DATES[${my_patch_index}]}.patch.gz)"
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.asc )"
+			done
+
+			UPSTREAM_PATCHES+=( "${WORKDIR}"/${MY_P}-${PATCH_DATES[${my_patch_index}]}.patch )
+		done
+
+		unset patch_url
+		unset my_patch_index
+		unset urls
+	fi
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz"
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace"
+RESTRICT="!test? ( test )"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+# Block the older ncurses that installed all files w/SLOT=5, bug #557472
+RDEPEND="
+	${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${UPSTREAM_PATCHES[@]}"
+
+	# When rebasing Gentoo's patchset, please use git from a clean
+	# src_prepare with upstream patches already applied. git am --reject
+	# the existing patchset and rebase as required. This makes it easier
+	# to manage future rebasing & adding new patches.
+	#
+	# For the same reasons, please include the original configure.in changes,
+	# NOT just the generated results!
+	"${WORKDIR}"/${GENTOO_PATCH_NAME}
+)
+
+src_unpack() {
+	# Avoid trying to verify our own patchset tarball, there's no point
+	if use verify-sig ; then
+		local file
+		for file in ${A} ; do
+			if [[ ${file} == ${MY_P}.tar.gz ]] ; then
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig
+			else
+				[[ ${file} == @(*${GENTOO_PATCH_NAME}.tar.xz|*.asc|*.sig) ]] && continue
+
+				verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	# bug #115036
+	unset TERMINFO
+
+	tc-export_build_env BUILD_{CC,CXX,CPP}
+
+	# bug #214642
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
+
+	# bug #852665
+	if [[ ${CHOST} == *-cygwin* ]]; then
+		BUILD_CPPFLAGS+=" -DBUILDING_NCURSES"
+	fi
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		ncursesw
+		ncursest
+		ncursestw
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. bug #249363, bug #557598
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-solaris*) dbuildflags="-Wl,-R,${WORKDIR}/lib" ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		CPP=${BUILD_CPP} \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal --with-progs
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${ABI} == x86 ]] ; then
+		# For compatibility with older binaries at slight performance cost.
+		# bug #616402
+		use stack-realign && append-flags -mstackrealign
+	fi
+
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		# (Originally disabled until bug #245417 is sorted out, but now
+		# just keeping it off for good, given nobody needed it until now
+		# (2022) and we're trying to phase out bdb.)
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+		--disable-pkg-ldflags
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! has_version -b "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext)
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(usex tinfo 'tinfow tinfo' '')
+	fi
+
+	# Don't delete '*.dll.a', needed for linking, bug #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	# -FIXME-
+	# Ugly hackaround for riscv having two parts libdir (bug #689240)
+	# Replace this hack with an official solution once we have one...
+	# -FIXME-
+	dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \
+		/usr/$(get_libdir)/terminfo
+
+	# Remove obsolete libcurses symlink that is created by the build
+	# system. Technically, this could be also achieved
+	# via --disable-overwrite but it also moves headers implicitly,
+	# and we do not want to do this yet.
+	# bug #836696
+	rm "${ED}"/usr/$(get_libdir)/libcurses* || die
+}
+
+multilib_src_install_all() {
+	local terms=(
+		# Dumb/simple values that show up when using the in-kernel VT.
+		ansi console dumb linux
+		vt{52,100,102,200,220}
+		# [u]rxvt users used to be pretty common.  Probably should drop this
+		# since upstream is dead and people are moving away from it.
+		rxvt{,-unicode}{,-256color}
+		# xterm users are common, as is terminals re-using/spoofing it.
+		xterm xterm-{,256}color
+		# screen is common (and reused by tmux).
+		screen{,-256color}
+		screen.xterm-256color
+	)
+	if use split-usr ; then
+		local x
+		# We need the basic terminfo files in /etc for embedded/recovery, bug #37026
+		einfo "Installing basic terminfo files in /etc..."
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+		use minimal && rm -r "${ED}"/usr/share/terminfo*
+		# Because ncurses5-config --terminfo returns the directory we keep it
+		# bug #245374
+		keepdir /usr/share/terminfo
+	elif use minimal ; then
+		# Keep only the basic terminfo files
+		find "${ED}"/usr/share/terminfo/ \
+			\( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \
+			-type d -empty -delete || die
+	fi
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-libs/snapd-glib/Manifest b/sys-libs/snapd-glib/Manifest
new file mode 100644
index 000000000000..91d560c155f9
--- /dev/null
+++ b/sys-libs/snapd-glib/Manifest
@@ -0,0 +1,3 @@
+DIST snapd-glib-1.63.tar.xz 187676 BLAKE2B a212f826ee35ef5458b716ce64d8f4b32474f991938bc314fcdb0feb5c803f93880a517fe5e1550bc82bc4992bee7467dc0d8cf5cb260712e83b8a1fe6b75743 SHA512 94a2f46e4e066270ea5492cb00fd44da247686a354cbe6766fe3e8974e6bb51f4cf1ca95027533417ec8c8117fc9d3866cb173a113b89d789b6ba518489a314f
+EBUILD snapd-glib-1.63.ebuild 1150 BLAKE2B d766bca4abdb1fc8913e483159e6831e060a148bdc51ae60144072671b83b27ea6be416f0fec150bf148742f570a0d70d817b0fbfc3bb9d440e4ce20a6437031 SHA512 b883fd6d734203d4ed35f1c9a98331236f7d74ffacb77d20985f114a63eb73f9f91ca9aba8da4784782bb62b9393668e5dcf56cd34cb861ef64e6fffd53cbb57
+MISC metadata.xml 406 BLAKE2B ee1d1cdc33311cea7a3bcc4288fb8ec0148327eaa6fc59fd7c18ff3b34d9624a9e42a85f47254205a3d078651012d52ddc5f2dbf693f0250afc4194e389ba4be SHA512 1331657e9efe50b9901b2acc60694edf2c9f518a37f2a0d346969b78ceffe75d88a0503bb43fdac9a75eb81706440d99d8ce3eb6b9b112163438474b823338e1
diff --git a/sys-libs/snapd-glib/metadata.xml b/sys-libs/snapd-glib/metadata.xml
new file mode 100644
index 000000000000..8e8a7baf2077
--- /dev/null
+++ b/sys-libs/snapd-glib/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">snapcore/snapd-glib</remote-id>
+	</upstream>
+	<use>
+		<flag name="qml">Build the QML bindings</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-libs/snapd-glib/snapd-glib-1.63.ebuild b/sys-libs/snapd-glib/snapd-glib-1.63.ebuild
new file mode 100644
index 000000000000..8728ba207b25
--- /dev/null
+++ b/sys-libs/snapd-glib/snapd-glib-1.63.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson vala
+
+DESCRIPTION="glib library for communicating with snapd"
+HOMEPAGE="https://snapcraft.io/"
+SRC_URI="https://github.com/snapcore/snapd-glib/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+IUSE="doc introspection qml qt5 vala"
+REQUIRED_USE="
+	qml? ( qt5 )
+	vala? ( introspection )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+DEPEND="
+	dev-libs/json-glib
+	dev-libs/glib:2
+	dev-util/glib-utils
+	net-libs/libsoup:3.0
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	qml? ( dev-qt/qtdeclarative:5 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		)
+	vala? ( $(vala_depend) )
+"
+
+RDEPEND="${DEPEND}
+	app-containers/snapd
+"
+
+pkg_setup() {
+	vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		"$(meson_use doc docs)"
+		"$(meson_use introspection)"
+		"$(meson_use qml qml-bindings)"
+		"$(meson_use qt5 qt-bindings)"
+		"$(meson_use vala vala-bindings)"
+		-Dsoup2=false
+	)
+
+	meson_src_configure
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f47ec7ec6c56..6c826d40ac74 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/bottom/Manifest b/sys-process/bottom/Manifest
index 1d9af7733ebe..bb2a2a3308d9 100644
--- a/sys-process/bottom/Manifest
+++ b/sys-process/bottom/Manifest
@@ -250,5 +250,6 @@ DIST windows_x86_64_msvc-0.42.0.crate 659377 BLAKE2B f01dbfcb86dcb7301790a1a7046
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST wrapcenum-derive-0.4.0.crate 7281 BLAKE2B fd5c935f64c6bb7d1e7e4fbe38b6550ac1cbea7d0817204e5c0d73c6711028e472f323563ff52e329f9cbadf5d45d547e3468a8b97f3d5577514cdc705714edd SHA512 85b8a9ec70ef30c2de04ad766694a5b29ea97d0cefab0708421976f1b5168761f8af652851155e06b5eb39fce32e3c9ceb4ff440f8ef687aa2b03c7017f1de0d
 EBUILD bottom-0.7.1.ebuild 5316 BLAKE2B 485e919b579d613fdd14dd290aa64d71e5c2e630246168e220d7a8067c733d7c60c27d080ffe88c2325ad42db85389ddd431fc9af48614033b72e973f46a58a3 SHA512 885c7192fc27b8ea5fc51410e6613999730a2a037226a179bc6523d6355e608604051535b389917af6b6ba094326b8904358f8f0fbfafcc9b72d9823452db6fb
+EBUILD bottom-0.8.0-r1.ebuild 5627 BLAKE2B 201ccd78b5f5621e53643c23f5bd8d950e8961e04aa5caff0734b12a362a0d0fce3b24fd9e18e7c4f5e7fc35b2412df868bf0b28ce9521a980b9c0121946b626 SHA512 421461362b31b42c945e1c8f1cf0ecc82593b627be32c710a79c2bff26554f71fcf98e50f7b221b668703e2576ac9d61cdb58215396e78ef549e2594205fac6c
 EBUILD bottom-0.8.0.ebuild 5586 BLAKE2B 3a0f9dad111004156d90f3a929819e84759f7a89de3dfba396b42c012417acd003af3d6b52cc6e84c29f4d58c7af059faba0b879960552fe4fd2da19fd939ccb SHA512 cf8d5188f0d6dd49d1a1836c68b111c4252ac5909bd0f0ca97e32bf661c503a1166f0f6fee59b7280ea1354eb15add86347a93274e4b97994c881cbce93a6b71
-MISC metadata.xml 797 BLAKE2B 444693b0becb99edaa93f5623dfa48058648852e0d328802001df5de7661ca8a5f07e920f75aaa06ad7287cbbb46e47f24e5f9897d626574ade3d6270f8eea6f SHA512 e209429c2824e3248c7c2e89b121c6665f80d3a410038709c19fbc9a30b118edd317b8f0b1dab8059aa8c74a3b72d8086f35cd19f7c722d106e0aba5c2586c3d
+MISC metadata.xml 966 BLAKE2B 1b23ea1d8fb31ff8b6d039c408f738d5f2858b17e6ec685265fc19828e3e05a8f10718084a2a72d6d38bf278d6bbd0089777cf99e7366ca11670ab7ce3be4a69 SHA512 3fe83314b77e63a2261bc3c2967f5fc53e590e8f4461609be181504ebd8c690cea119c8dd7b6dec692691e7f33d363f13858b525d09929e2672aadc448443071
diff --git a/sys-process/bottom/bottom-0.8.0-r1.ebuild b/sys-process/bottom/bottom-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..593cb8a5465e
--- /dev/null
+++ b/sys-process/bottom/bottom-0.8.0-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.19.0
+	adler-1.0.2
+	aho-corasick-0.7.18
+	anyhow-1.0.57
+	assert_cmd-2.0.4
+	async-channel-1.6.1
+	async-executor-1.4.1
+	async-fs-1.5.0
+	async-io-1.6.0
+	async-lock-2.5.0
+	async-net-1.6.1
+	async-process-1.3.0
+	async-task-4.2.0
+	atomic-waker-1.0.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.67
+	bitflags-1.3.2
+	blocking-1.2.0
+	bottom-0.8.0
+	bstr-0.2.17
+	byteorder-1.4.3
+	cache-padded-1.2.0
+	cargo-husky-1.5.0
+	cassowary-0.3.0
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.12
+	clap_complete-3.1.2
+	clap_lex-0.1.1
+	clap_mangen-0.1.6
+	concat-string-1.0.1
+	concurrent-queue-1.2.2
+	const_format-0.2.30
+	const_format_proc_macros-0.2.29
+	core-foundation-0.7.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.7.0
+	core-foundation-sys-0.8.3
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.25.0
+	crossterm_winapi-0.9.0
+	ctrlc-3.2.4
+	darling-0.10.2
+	darling_core-0.10.2
+	darling_macro-0.10.2
+	difflib-0.4.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	doc-comment-0.3.3
+	either-1.6.1
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	event-listener-2.5.2
+	fastrand-1.7.0
+	fern-0.6.1
+	filedescriptor-0.8.2
+	float-cmp-0.9.0
+	fnv-1.0.7
+	futures-0.3.25
+	futures-channel-0.3.25
+	futures-core-0.3.25
+	futures-executor-0.3.25
+	futures-io-0.3.25
+	futures-lite-1.12.0
+	futures-macro-0.3.25
+	futures-sink-0.3.25
+	futures-task-0.3.25
+	futures-timer-3.0.2
+	futures-util-0.3.25
+	fxhash-0.2.1
+	getrandom-0.2.6
+	gimli-0.27.0
+	glob-0.3.0
+	hashbrown-0.12.3
+	heim-0.1.0-rc.1
+	heim-common-0.1.0-rc.1
+	heim-cpu-0.1.0-rc.1
+	heim-disk-0.1.0-rc.1
+	heim-memory-0.1.0-rc.1
+	heim-net-0.1.0-rc.1
+	heim-runtime-0.1.0-rc.1
+	heim-sensors-0.1.0-rc.1
+	hermit-abi-0.1.19
+	hex-0.4.3
+	humantime-2.1.0
+	humantime-serde-1.1.1
+	ident_case-1.0.1
+	indexmap-1.9.2
+	instant-0.1.12
+	io-lifetimes-1.0.4
+	itertools-0.10.5
+	itoa-1.0.1
+	kstring-2.0.0
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.137
+	libloading-0.7.3
+	linux-raw-sys-0.1.4
+	lock_api-0.4.7
+	log-0.4.17
+	macaddr-1.0.1
+	mach-0.3.2
+	mach2-0.4.1
+	memchr-2.4.1
+	memoffset-0.6.5
+	miniz_oxide-0.6.2
+	mio-0.8.5
+	nix-0.19.1
+	nix-0.23.1
+	nix-0.26.1
+	normalize-line-endings-0.3.0
+	ntapi-0.3.7
+	ntapi-0.4.0
+	num-integer-0.1.44
+	num-rational-0.3.2
+	num-traits-0.2.14
+	num_cpus-1.13.1
+	num_threads-0.1.5
+	nvml-wrapper-0.8.0
+	nvml-wrapper-sys-0.6.0
+	object-0.30.2
+	once_cell-1.5.2
+	os_str_bytes-6.0.0
+	parking-2.0.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.4
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	polling-2.2.0
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	proc-macro2-1.0.49
+	procfs-0.14.2
+	quote-1.0.18
+	rayon-1.5.2
+	rayon-core-1.9.2
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.7.1
+	regex-automata-0.1.10
+	regex-syntax-0.6.28
+	roff-0.2.1
+	rustc-demangle-0.1.21
+	rustix-0.36.6
+	ryu-1.0.10
+	same-file-1.0.6
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.82
+	signal-hook-0.3.13
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	slab-0.4.6
+	smallvec-1.8.0
+	smol-1.2.5
+	socket2-0.4.4
+	starship-battery-0.7.9
+	static_assertions-1.1.0
+	strsim-0.9.3
+	strsim-0.10.0
+	syn-1.0.107
+	sysctl-0.5.2
+	sysinfo-0.26.7
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	termtree-0.2.4
+	textwrap-0.15.0
+	thiserror-1.0.38
+	thiserror-impl-1.0.38
+	time-0.3.9
+	time-macros-0.2.4
+	toml-0.5.10
+	tui-0.19.0
+	typed-builder-0.10.0
+	typenum-1.15.0
+	unicode-ident-1.0.6
+	unicode-segmentation-1.10.0
+	unicode-width-0.1.10
+	unicode-xid-0.2.2
+	uom-0.30.0
+	wait-timeout-0.2.0
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wepoll-ffi-0.1.2
+	widestring-0.4.3
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.44.0
+	windows-sys-0.42.0
+	windows-targets-0.42.1
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	wrapcenum-derive-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A graphical process/system monitor with a customizable interface"
+HOMEPAGE="https://github.com/ClementTsang/bottom"
+SRC_URI="$(cargo_crate_uris)"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="+battery +gpu +zfs"
+
+# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
+QA_FLAGS_IGNORED="usr/bin/btm"
+
+src_prepare() {
+	# Stripping symbols should be the choice of the user.
+	sed -i '/strip = "symbols"/d' Cargo.toml || die "Unable to patch out symbol stripping"
+
+	eapply_user
+}
+
+src_configure() {
+	myfeatures=(
+		$(usev battery)
+		$(usev gpu)
+		$(usev zfs)
+	)
+
+	# This will turn on generation of shell completion scripts
+	export BTM_GENERATE=true
+
+	# https://github.com/ClementTsang/bottom/blob/bacaca5548c2b23d261ef961ee6584b609529567/Cargo.toml#L63
+	# fern and log features are for debugging only, so disable default features
+	cargo_src_configure $(usev !debug --no-default-features)
+}
+
+src_install() {
+	cargo_src_install
+
+	# Find generated shell completion files. btm.bash can be present in multiple dirs if we build
+	# additional features, so grab the first match only.
+	local BUILD_DIR="$(dirname $(find target -name btm.bash -print -quit || die) || die)"
+
+	newbashcomp "${BUILD_DIR}"/btm.bash btm
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/btm.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins "${BUILD_DIR}"/_btm
+
+	local DOCS=( README.md )
+	einstalldocs
+}
diff --git a/sys-process/bottom/metadata.xml b/sys-process/bottom/metadata.xml
index cc41a7f280aa..b69962904de5 100644
--- a/sys-process/bottom/metadata.xml
+++ b/sys-process/bottom/metadata.xml
@@ -17,6 +17,8 @@
 		<remote-id type="github">ClementTsang/bottom</remote-id>
 	</upstream>
 	<use>
-		<flag name='battery'>Include support for laptop battery information.</flag>
+		<flag name='battery'>Include support for laptop battery information</flag>
+		<flag name='gpu'>Include support for GPU temperature and memory usage information</flag>
+		<flag name='zfs'>Include support for ZFS ARC memory usage information</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 26492090038e..1f4149ee39ed 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 2afa8e344d12..5d1e0f2c6cf1 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -2,5 +2,5 @@ AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da
 DIST mod_wsgi-4.9.0.tar.gz 699891 BLAKE2B 7ee6ffc28e86baf8ee92973479a26964f7c183c2b113b49a48af02c622f8d8f698abffcd4f522a1ecca5b89325f94856cbe89db5a81d2ac2e87438ee90be97b0 SHA512 9dc34d431171321094a9713444895d9754eff4e69ad1e86c8d3cd77bc1ca0a4c10b697e7f8cf14902d6bfaf205c8842e62fa944bb38f66f1c54fd36af95a09d6
 DIST mod_wsgi-4.9.4.gh.tar.gz 706904 BLAKE2B 6473ee5be4f21d7d5806028b22d582e9d2b6f2a28bb0ed2b03a3da799858bdb4ebcfc85eb7850e91ff041d0c0a6cf2a898bffbbe884faa891c4f1f115d043517 SHA512 0898221d95f0ce374cbd34a1849a6e6b5bd7850644d5fe36f558dcc58095cd535c854cb06798482d312485b8d89b8641d91fa26af3d208e10a6073b885af3199
 EBUILD mod_wsgi-4.9.0.ebuild 1108 BLAKE2B b85f3abbc1b1da6af973babf3aa2142a1dd5b571ea345d2cbc7cbc418dff5b5389cdff674ec6389f4bdde76f4fcc0ac4602cfaea0ccfe7869c9586690c2b50ca SHA512 d993d3cb33f60839a8b68bffbdf91e50a56e4d84ad6dfac5568a6a1dbbd19be182099c1d7ee8a16a8a3f293be40ca31cce1038677cd3fc5b111ddf8152a54e6b
-EBUILD mod_wsgi-4.9.4-r1.ebuild 1096 BLAKE2B 6c69859c5dfdf9c6a61356b0041c9e77fc86e0f3a9ef89dfce8e64c13cab9dc5af23d15d4c559a43212ed6f77fe555e87025f56804b8b8f8bee653c6ef464e85 SHA512 943ed5126a77b36236a44cf7a60ed8b73b1981f897fdffec37213bb895bf685d0a4932164f276f70fca84c74794775a39c8c6be5439d6923e8586c237d9d7b77
+EBUILD mod_wsgi-4.9.4-r1.ebuild 1093 BLAKE2B bb0d072da7e4e2a9e2dd344075f89be656a4cc36ff3ba9ff053581e9ad82801eab8b3c6b184eafa9410d5fc42f8e5851ec5aed7b9c5fcbeb82e586340ae18924 SHA512 004903697b5d4931ab2b9a26aa59fa70794b87228bd8e70f2aa7c50e097eb6ef03ca94fcdd7529c323c07be0ff6908868566ed826bf10e0855fab125cbf19039
 MISC metadata.xml 303 BLAKE2B 3b6303fa847f0f5b287faece9a7f0ce422531e0a0a130035cb5a032049daccba08c5460fc58af8a68d2eede0b8f5e76502e9c64109f33f219757ace3b2e82b98 SHA512 d24e5bcec7363bc5bb7f3c5798aa6978aefaee6990f5917ff133362fdcc32927a7b68a939b90cf38ebddbcf04c5b6310a1654a92d0a5eece5ba27245b8df0550
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild
index 7b4cb2455a4c..b6f56dd96b64 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.9.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 17c19f1d245e..0cfc6e93d2fb 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index fb61f02722e2..e1ae7b7cafc3 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,10 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-DIST drupal-10.0.5.tar.gz 17424348 BLAKE2B 8ccaf40e3e082906c89536ab7b4e5ca02fe7f98becb590e1e9740b2cca56657a9f4f1fc636de014007673ad3001bc1888511bcf645772b8bf514becd0cf6a9de SHA512 650c45e285fd805e1d311881c66485c407b2f4b3aa9a379893f226d55e7be978c3ff1c7a0ee061e213a3aab9bff8fddcf1339131454d6b29d5c8a03936124362
-DIST drupal-7.95.tar.gz 3380331 BLAKE2B 03b7434ef323cd8c26349ae11b65835a30dfb131f5fea36b6ec856d77a57756886fca79ad4f6ef033ab2716713993dcad331c96f99a5291e9083b8151652aa13 SHA512 7e013adc687ea263ff63eecee876367d5a2e4467a44fc4cc0d14a54f82d21b66069aa0ef7123370cdaf0d051a6c2fc870f359d2f2d657a59b41506e7dec8ad84
-DIST drupal-9.4.12.tar.gz 21629697 BLAKE2B ffade207c552cbcdc02bfdee672a6f628bb74dbc1bf3e6f276482c838559a7fa195e1c919da6119bdd1edce3b2032ecfb2a9c6694e8894035b22640011d9d92a SHA512 a4e09dbdc6255a82a5948f30f458ed89a0e930703830023116627097f12c2e27c4b0c42feaec21c89db791976a5bd4d2c05d9c02a710384fe4978489ceb78954
-DIST drupal-9.5.5.tar.gz 22560005 BLAKE2B 5a79e0d20273e59e1ad88039fb263fa68397d51bc6f614db8e6396d24169cd7b8314e4a0e26f558a0d8a421b0089210c68a26cac3a0d0205421fde52efd4e6f1 SHA512 d965f5e251bc9eb6f392455724b6321ac3c0e6d134ffbff208748aca397dc98c8ff97d2e1ff2369bf97ba8c9416fc0c5d779b33a194af16343ebc584a8cade68
-EBUILD drupal-10.0.5.ebuild 2218 BLAKE2B b451ecec0fff28ac11635145d3ad3dabdab79fd87fb91ce1086136456e9df5769ea347777b6b2432e24c31623e4eb6ccc1a1e7c62ddb07a73c74206ab2d52372 SHA512 7aa2a930f68342691d17493aa9deb9f817623f8582ce153af9a571ab1d8800840353e1c68173211f499a8ac40b12f0a5c52670ebbefbae3d7b456091208d2608
-EBUILD drupal-7.95.ebuild 1546 BLAKE2B 807a97c0eb24a6c6e1cac6f3132bb5ca61c3df24ec4b2f2aee7d18cd43ed8eb67b312b978e934e1962cd024f9cff7eb114071b0cba384fbfaff80e8ce794b2b3 SHA512 19bd15a3163738dd03372668fdb621a1a914b4fa54d8eae1dfaf37c1cab2b952c5087f000695e6b5857469c1235f52ccc5ae856a4b00c681bce5729a0b72cc7d
-EBUILD drupal-9.4.12.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
-EBUILD drupal-9.5.5.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
+DIST drupal-10.0.8.tar.gz 17433029 BLAKE2B 8fbdb7ca86decea007ecd369f5f9c9c9a751ee56df9db5ce117be2cba8d3d82f09994344590be1d3ce690fa747d4a59cf3c04f7427ee531f322d0ecaab5a1a7a SHA512 e1fccce448019b3cfb3a08d0fdd6e6f3ff4ce5110c51393e5c99242e1250e25a647029e4c69600f0e52da8585ae2dcb53804de860fde952928e07b694a61a070
+DIST drupal-7.96.tar.gz 3381093 BLAKE2B 5b9468cf1805697649f7414695f1dda3e1f79bdd89213367f86b5c2722a3b6c96f9eb225871ce86ccef246eebbad54fc895761c6fe3e8480ca31f2bbd399aedf SHA512 50904f98bf090c3c6d77fa962f9b64c0b0506584337af0ae3ca964f3216a884cb7597f85c209496777390c97fd010fc888bb5d1db4ee08748dc79a37bef14dc6
+DIST drupal-9.4.14.tar.gz 21636221 BLAKE2B e09ae96efb6037be6c9ebcc6785eef6c75cae2988f41aec8c76c761259beb45063ed013f9e5680d1059f0c3051926f08adfc524266e35948814ccb0ca2492806 SHA512 84df434ffaa35b2ef8aef877196732f1038f47e2028091c3b7de47c686f8767ad091573fee531c9d765064b33b94d727258c390c4159d106ef2cbd6e186423f1
+DIST drupal-9.5.8.tar.gz 22577412 BLAKE2B f0f372aa4af0356f22e8c37a16b68ae572382f63a0eb030b5a2331d61489769ecf1a99e0428b95f242d725d7125d82857df27c166d599da18b09f1c64fba48c0 SHA512 bb5d1441319d5fb15838535c2af66087ebf7a87f5f91d5a3ef33f74d92104846a8183bce1404b48454d49ff19d5b9afeef0e4bc790c1ac43e5d404fbf927361e
+EBUILD drupal-10.0.8.ebuild 2218 BLAKE2B b451ecec0fff28ac11635145d3ad3dabdab79fd87fb91ce1086136456e9df5769ea347777b6b2432e24c31623e4eb6ccc1a1e7c62ddb07a73c74206ab2d52372 SHA512 7aa2a930f68342691d17493aa9deb9f817623f8582ce153af9a571ab1d8800840353e1c68173211f499a8ac40b12f0a5c52670ebbefbae3d7b456091208d2608
+EBUILD drupal-7.96.ebuild 1546 BLAKE2B 807a97c0eb24a6c6e1cac6f3132bb5ca61c3df24ec4b2f2aee7d18cd43ed8eb67b312b978e934e1962cd024f9cff7eb114071b0cba384fbfaff80e8ce794b2b3 SHA512 19bd15a3163738dd03372668fdb621a1a914b4fa54d8eae1dfaf37c1cab2b952c5087f000695e6b5857469c1235f52ccc5ae856a4b00c681bce5729a0b72cc7d
+EBUILD drupal-9.4.14.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
+EBUILD drupal-9.5.8.ebuild 2067 BLAKE2B 19a4b56c9002b352e7743607cd7355bbe084bc1f1af41d5e8766ebdc5cc0abcf6e9869f54edecf08e79fba5c25b39e683860ddd8fee675c9fcb28b83d7674cbb SHA512 45ccf8af32619440774e7d3022854204d8ff68a4dea1429cf4c248e1f59f40323b0f87f5b5d477b826c62dcee5a1a8a002d01000a2cabdb7ba7562ac008b8c06
 MISC metadata.xml 382 BLAKE2B 1aadacb731da32a7f383c9d265880568cd74a67c79fdfea2b45bdad9dd55e09b074b6f71097bfc9dd43349f826af4b87a81c4f6ab6647eca5d85d07f9afa9638 SHA512 6a9f00eb8cbfcf407738e3702d14ef8c52c75c4d28f5ce3f25e41fa062dc73a777b344b2a225727e0c1c75c34d1f4ea1eadabdbdd58c296a9d41b64120607a0b
diff --git a/www-apps/drupal/drupal-10.0.5.ebuild b/www-apps/drupal/drupal-10.0.8.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-10.0.5.ebuild
rename to www-apps/drupal/drupal-10.0.8.ebuild
diff --git a/www-apps/drupal/drupal-7.95.ebuild b/www-apps/drupal/drupal-7.96.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-7.95.ebuild
rename to www-apps/drupal/drupal-7.96.ebuild
diff --git a/www-apps/drupal/drupal-9.4.12.ebuild b/www-apps/drupal/drupal-9.4.14.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-9.4.12.ebuild
rename to www-apps/drupal/drupal-9.4.14.ebuild
diff --git a/www-apps/drupal/drupal-9.5.5.ebuild b/www-apps/drupal/drupal-9.5.8.ebuild
similarity index 100%
rename from www-apps/drupal/drupal-9.5.5.ebuild
rename to www-apps/drupal/drupal-9.5.8.ebuild
diff --git a/www-apps/xpra-html5/Manifest b/www-apps/xpra-html5/Manifest
index d098d4f493bf..32f83b17932f 100644
--- a/www-apps/xpra-html5/Manifest
+++ b/www-apps/xpra-html5/Manifest
@@ -1,5 +1,5 @@
 DIST xpra-html5-5.0.tar.gz 1570694 BLAKE2B aef7b818aa618c143701993627e629884b5e696c7334e6b75701a20028f18aced5e3249505ac031d6cd0a08d79ca2b9728afdb2e90712fcbe45d43d02598f608 SHA512 8318c6dd8f8f53d0a132272c2bb8c69e8ba928f2f267679aee48cec4598faa828788a219dfa342162e1fcf8159bf46b44d50db57180f1aa972edd67fa43e9cd5
 DIST xpra-html5-6.1.tar.gz 1416380 BLAKE2B ba0e2bdcae91b30a1f46655dc505f5338cd8c516414f55871c6bc01b6bdcd81d351d66c575c6a7a219cb0c29e7da17e8db558b928dc89067b5ad3289520005f2 SHA512 3539c235f38a66f0a8eaea679df4b4bb4a1ef778ab31baf705acc29b0d4b3998ae84081eeac085db973d170afaa1ee0f167124efc3e48266145fdbef255a6bf5
 EBUILD xpra-html5-5.0.ebuild 947 BLAKE2B f8d55d9fc2da3dffb18706702f3e3d050d082336cd208dcd16baf67d43c6214dbcdf79c81dc4a26889b3681a54281ffc5bbd601aa57f3d90c5b9821bb38bd42b SHA512 ec52f0892f9476e1f18c4c1afd81515bd4210095caf31308ba881983e2c6f9e81e18110e91ec44ff6b98c9e0cb26db084f588601e4de81e4ea874bec5344ea72
-EBUILD xpra-html5-6.1.ebuild 952 BLAKE2B 12da5571f00df4ebb00211ffc5b52881b6407b9a3a928f1d7ea8ef3a4892184dc2a73e507b6032b7368f11c1a52c12bcd686c0c4d574a9d6dd1cd8da9f58e56c SHA512 260aa59a8934f4540e16bd094df1e618683778c6de906ffd87413085edb554b83ac040a4d1af7696cae4e51b74c792327e0fe15088b4adc2b1e9ec29e558da34
+EBUILD xpra-html5-6.1.ebuild 951 BLAKE2B 1e1333a152fc1cb607ebe8cb59cf7a5f9e544f8e603b1db6f51c8991c7d68bdecdf0c55d6b7e0fa2daa467a6c85dda4168eb6a6a10480546afa97b50b44ed8bf SHA512 c5af79c29c8d078bb96227dda4df7d85a6aae46c928ae2b60bd03ac5c84f610a21d989689a5ae7a092b941681346f0e99c89e193681a5cb807aed9a9acb5b1e0
 MISC metadata.xml 551 BLAKE2B 6d62f17a775361ec0b066cb994bc5a6ccc841e61991aa44a72512e82ac94c6a66ad7fbf3998c784cf830cfe44f03e496edd9b491e95f173fea71f328349bd457 SHA512 d839ba317b8d58e5849de92243408096799b1328baa3d46e0ca06e4c038639a35566a9a636f7da491820bc0e3af0cbd5e18043bf815b873f3ead4d68ff54c960
diff --git a/www-apps/xpra-html5/xpra-html5-6.1.ebuild b/www-apps/xpra-html5/xpra-html5-6.1.ebuild
index 047debce69ae..b61b4635fe66 100644
--- a/www-apps/xpra-html5/xpra-html5-6.1.ebuild
+++ b/www-apps/xpra-html5/xpra-html5-6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Xpra-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="brotli +gzip minify"
 
 BDEPEND="
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 091b10c0a8c2..401323b30f96 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 729bfe9b6509..c6f3fae43196 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-109-system-zlib.patch 440 BLAKE2B 95bb1099055e3e0e122d4d8a77cddec0a
 AUX chromium-111-InkDropHost-crash.patch 1066 BLAKE2B ee0b42803a59ef4731e4f316849c2062870b92040ff4e339c3f3f2562999b54fa3176b27e432f31ada76559087631fd623d9f57f1961a42acd0684041c322a01 SHA512 dfa3ab6a84b57b6e66053be2597f0d6c7f4caf54b0e45a359774a56dfbe1e65bdea91120134e77b1e7c38c336a4fd8d05a7c26e9d3bf4bdc0fe40ad7cd832a54
 AUX chromium-111-ozone-platform.patch 1482 BLAKE2B 613e233697fbd569a135ec1d4d92a8c6962cdbbeb8a478a53a8be3d80f0797a846c46d590443aa2f5b1350b4d586fa9c5f29ee85600bd292deaffa44bb9987ce SHA512 0befdf3757517fed2e37d58b1b6a86d113289f8f506333c1be244f583b638fd39da90f5021322856d98e0f535f766d6f1d17301e99dd451c727f61ea8f9f3532
 AUX chromium-112-compiler.patch 8807 BLAKE2B 464d3fa8e4a48271b152256e1aa1e617722654eb672c65af2ad0f3d16948b6443f4d7065dfe46663b5b65c6482ca80f4aac2dbe6bb403d0ce0fb6689c3ed9401 SHA512 cb5358640d4c1d175f285c66b5d97cfc282c7444c56771b427b05ddd88e3a783d4455d3afbc5dd2bca0a03349008b4b8fd183833e5e43d47cf3215cc98398e86
+AUX chromium-112-gcc-mno-outline.patch 1203 BLAKE2B 82dcb024fbd4e032a998b0fbaf21662bb2ac67ca9dce73d58944f9ffea8339721209b044a69e0d3f5bebe680a17e15dcac5b6fd7ecf4f567e1a24923fdb2a1c4 SHA512 c45d0e1eb1eb221dc61bad7d917187f0bed4732211032206f001086d2e5398383329daff1f5a47804bfc89b16de90fdf2ab9b4ddf846bce65af8a5b55206611a
 AUX chromium-112-libstdc++-1.patch 3045 BLAKE2B 195dd794a4a00fb0a354ca6e8c56c102112c672ffeb28363874788aff1f3ffbf620b23fa39f824923bf5c009424f6bf01050950d5d277abf59c9944159166aa1 SHA512 29f422a076120f0de98b6af6eb2936bf4a924fd9d5cc5c4fa5bda9f6cf51288f51ba32149233030f9cb5c1382330601a67cb824bdd33cddb5c26ea5cea16606b
 AUX chromium-112-libstdc++.patch 2874 BLAKE2B f354b06944a761556b6d0465aee2a1dd701b18cdd272a1aa4aa68405ad05f575d1f0ef04ca2b05d5e65ce54efab31cfdf95e8963613ef7c811aaf343662e4b62 SHA512 b0307d10708b0ea9f94e941b9b734a16b4f74b7149e11cd6b30532835074e773c3499f954f38935bf7f16ebbda6dcf53695b513e56ff5bb0d810b4b1a6f4d3ac
 AUX chromium-112-sql-relax.patch 2064 BLAKE2B 37f362da2af26481f15f705466ce1eb282759ddad0cdc34a967120e26a2894bd5a1f22b69f6b3749a84bd1b155c55cbaeffebb2b7405d5eb80c7c59124a90ba4 SHA512 83e852e6710a748030b001fccede282830c00db102f338dfd92a0a86865d0f25456ae9adc3ab5b33719b156b8f0274df347c18e4670c53e57568afdeaf874804
@@ -16,11 +17,14 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-111-patchset-2.tar.xz 21480 BLAKE2B e59d67d261df23c110c2db0644250c20d9e1cd6b99cb9513dbd12463faad8aea8520c5b5dbbfd2187a7795f7e34ebd3379fac4c3b2b01e30ffb4451b45084866 SHA512 7a2e660a9271b9b643dce5f7522570182eb895935312446775bf7c03a4c2d50d7f95c2082cac2dd477060d03f68e5424c990f535e0b1de9f0d12ac248806d043
 DIST chromium-111.0.5563.110.tar.xz 1740800700 BLAKE2B 77563b784d2a84a5c5b83779b54c633dcb38e25d3523c2254c07dcb7a3daedc352a48ffe4cb43d04569a10f98654da347bd463221755b492507d70183f8c28a9 SHA512 1274b14ef9b1eb418a87589979703731eb4907a90eb8ea58f343344f1e6c2bee1c88b3cb290485c833c0bda79a7c8ae59ba425c492e8738d19740cb0514e8ac5
 DIST chromium-111.0.5563.64.tar.xz 1740670460 BLAKE2B 325cd15ebc5eeac2e51ebf754c71e090369a1063421d5e294d5704655d782fc02006f6eed4b284a2dc49fab9b7077144179db6887ce4652b6e88846174de79c3 SHA512 3ba60778031a2015cff4f1944a466102923cb2b455d3333abdd3ee077ac3a8717c4fa4090c7d950ffd5ad5a77f139f68640fb5032b7afcae36012e4a34485bcc
+DIST chromium-112.0.5615.121.tar.xz 1730330344 BLAKE2B da7f1841b5246e506daf8d261ce0c985816aaaebe17a866a29e56e410d03ebc0b492f11336dcd1d5aeb268268cf325a313b63f192f1231ccfac276e7a10dfcfb SHA512 ba2144c24d1eaf94206c7992ddeb095b8a8d1c33ec5c25b63791a910584b4c835892833f1b7b32bbda6f9588a03fa1230d48a1a63d860394f1d48eb4ba161db4
 DIST chromium-112.0.5615.49.tar.xz 1730346508 BLAKE2B 715d0e3e6311110207900eba34c11434e781bac77a97c32038d8d030c91cecd285ad11f5722593d10c906a97f9e421dcb7fe25fd721c453d47315b8f89491d2f SHA512 48387f8b960a33520da70953912076582e83263b2194fdb8afddf888f5e4d31ade0bf41e19fbdc8c2827c3371228428072520fdda41c229c78e2d71c341961e0
 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 DIST chromium_111.0.5563.64-1raptor0~deb11u1.debian.tar.xz 442300 BLAKE2B ceb6691169073e1420daebba1eea1c00ab0f60786a276d116f02d8f693c542f853cc69083bb2f1dba4b2802413ba4d40591b04284a0816cbc814af99b0b9df38 SHA512 21525147a9c61de746c736b44007e57316155acdb71ba139d1b0f2f8d99ca1df7bf5087e736726f4062203e4dd20302ce3c523b9cb32309fb7ae017866f1f137
+DIST chromium_112.0.5615.49-2raptor0~deb11u1.debian.tar.xz 780000 BLAKE2B 2aa91c689b634f51978428f5992f41190e7c9b7d4009ee2f34a55e0666caf8ce02f5c5b6297702fe7ecb3a7961d5c84102ebda5189f3c513576a83f3c94dafa1 SHA512 b92b2a76a9ef6fc23ef06ae1d428f6755d9c8551230926a1c422c8c560ec95b1aa53a5a578519ba7426e6985c234cfd30573d8bb482499dd1532163975af293f
 EBUILD chromium-111.0.5563.110-r1.ebuild 39047 BLAKE2B 9c5549a83388f11c149ab3fc7f6a10650ee1fdc461cc4c693ca814adfd0a45247170becb8cf5ca2462a62ced7109737eaf0d79205c514dc1d32aafa5327942a7 SHA512 3b0b324d60482e69989436cce5a3ec79b35b2676ce6ce135139e7f848fded45197c4afd0428a0b2c96a749fba281130ca1fd9feaa9a11fe41087149dc361a4b1
 EBUILD chromium-111.0.5563.64.ebuild 38992 BLAKE2B a48b79ba64e4d04ec413b0b7369af14887726823358218adb4cdbe039af67e3a5c87efdef17556649d581f2280edfc01d31b1b4d4e23a5e20d35a5f8af018729 SHA512 d0e2550b9a2ee76afeab5478b7f3effe69d23a50d994aa2c1e2268c5eff14019aafdd0e9b007a409843b3060417980a2dc6d33ea9b24650901f4bd6191ee7f29
-EBUILD chromium-112.0.5615.49.ebuild 38761 BLAKE2B 42aa948b662c8b3ab5fa2f712c7daf4d265d2b39312355672bd3815969415a0e1f3626d0e7b44a39c793dc4efa380a110d68113ee05fa749f101e17f76cd2c4e SHA512 76a1e5cba2cdf0acb64b536a9d7c6f6ee53809370dbe810dd456523386ffb22f8388da143497b38890a56ac40325b22251bd644b60dc348203036d8db236f443
+EBUILD chromium-112.0.5615.121.ebuild 38818 BLAKE2B 2b42ee08010f92a703b4c9b6679fc567c08ba7ad3a9f9edcdf1aa77b13a9bed621362ebd91724c89c323dc8695c509a375f255c6fba060315a1aba046dc5b9ee SHA512 12c728ce4713a62e66df347a771a4d48bf5bfa6490ed7bf6db6bd9b1af720ac900cbae0f696355a028b25a36684010156cb12cf38b69e24625f1f6cfe16fb8f6
+EBUILD chromium-112.0.5615.49.ebuild 38768 BLAKE2B ef5ddf8d7d4f1f2618d9b949ea1e3e3b86e2ae98212193b154e698a8a940859f67711489176d5585926cb5c059972a002705559e423c365079de2837dd3f3b55 SHA512 375d1497b7bd74af31c0d5a355ec6681c9cdb49aa32d9bb89ea13d26688013f7e4b1653c3b5cba70f9a4aab5d97f2a0d98249fa4a3a983aa37c24ff4220116e2
 MISC metadata.xml 2167 BLAKE2B 3ad0af16da80ea03ce1deb54468b5668d1565742773e583f44688df3f7ea58a72271ccb58f467f0424bd601f4c7256ef6dc340a31a9a66547c3860069c812492 SHA512 6671a247003dae4accf588e2e62242286caf2310869a5ed5b327f46b484848a25d03baaf179a740ca8f7b2c30bf3095cf72c166fae8f0a15c63dad9174fa28ca
diff --git a/www-client/chromium/chromium-112.0.5615.121.ebuild b/www-client/chromium/chromium-112.0.5615.121.ebuild
new file mode 100644
index 000000000000..e48dbe582783
--- /dev/null
+++ b/www-client/chromium/chromium-112.0.5615.121.ebuild
@@ -0,0 +1,1252 @@
+# Copyright 2009-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+LLVM_MAX_SLOT=15
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+VIRTUALX_REQUIRED="pgo"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
+PATCHSET_NAME_PPC64="chromium_112.0.5615.49-2raptor0~deb11u1.debian"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	ppc64? (
+		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
+		https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz
+	)
+	pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
+
+LICENSE="BSD"
+SLOT="0/stable"
+KEYWORDS="amd64 ~arm64 ~ppc64"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid !libcxx )
+	screencast? ( wayland )
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng(-)] )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-3.4.0:=
+	)
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-sound/pulseaudio:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-libs/libX11:=
+			x11-libs/libXext:=
+			x11-libs/libxcb:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/libffi:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -gt 1 ]]; then
+		echo "|| ("
+		for _v in "$@"; do
+			echo "("
+			depend_clang_llvm_version "${_v}"
+			echo ")"
+		done
+		echo ")"
+	elif [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	fi
+}
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	!headless? (
+		qt5? ( dev-qt/qtcore:5 )
+	)
+	libcxx? ( >=sys-devel/clang-13 )
+	lto? ( $(depend_clang_llvm_versions 14 15) )
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+		$(depend_clang_llvm_versions 14 15)
+	)
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-13"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+pre_build_checks() {
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="12G"
+	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="14G"
+	if use lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		CHECKREQS_DISK_BUILD="13G"
+		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="16G"
+		use pgo && CHECKREQS_DISK_BUILD="20G"
+	fi
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_${EBUILD_PHASE_FUNC}
+}
+
+pkg_pretend() {
+	pre_build_checks
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
+		done
+	fi
+}
+
+pkg_setup() {
+	if use lto || use pgo; then
+		llvm_pkg_setup
+	fi
+
+	pre_build_checks
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 10.4; then
+			die "At least gcc 10.4 is required"
+		fi
+		if use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang && ! tc-is-clang; then
+			if tc-is-cross-compiler; then
+				CPP="${CBUILD}-clang++ -E"
+			else
+				CPP="${CHOST}-clang++ -E"
+			fi
+			if ! ver_test "$(clang-major-version)" -ge 13; then
+				die "At least clang 13 is required"
+			fi
+		fi
+	fi
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# disable global media controls, crashes with libstdc++
+	sed -i -e \
+		"/\"GlobalMediaControlsCastStartStop\",/{n;s/ENABLED/DISABLED/;}" \
+		"chrome/browser/media/router/media_router_feature.cc" || die
+
+	local PATCHES=(
+		#"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-98-gtk4-build.patch"
+		"${FILESDIR}/chromium-108-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-109-system-zlib.patch"
+		"${FILESDIR}/chromium-109-system-openh264.patch"
+		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
+		"${FILESDIR}/chromium-112-compiler.patch"
+		"${FILESDIR}/chromium-112-libstdc++.patch"
+		"${FILESDIR}/chromium-112-libstdc++-1.patch"
+		"${FILESDIR}/chromium-112-sql-relax.patch"
+		"${FILESDIR}/chromium-112-gcc-mno-outline.patch"
+	)
+
+	if use ppc64 ; then
+		local p
+		for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
+			if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
+				eapply "${WORKDIR}/debian/patches/${p}"
+			fi
+		done
+		PATCHES+=( "${WORKDIR}/ppc64le" )
+	fi
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+	sed -i -e "s|vpython3|${EPYTHON}|g" testing/xvfb.py || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/ceval
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/systeminfo
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/bidimapper
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/content_analysis_sdk
+		third_party/cpuinfo
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt
+		third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/highway
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/ipcz
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libavif
+		third_party/libevent
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/material_color_utilities
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/omnibox_proto
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/pthreadpool
+		third_party/pyjson5
+		third_party/pyyaml
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/selenium-atoms
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/tensorflow_models
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/wayland
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/glibc
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+	if ! use system-av1; then
+		keeplibs+=(
+			third_party/dav1d
+			third_party/libaom
+			third_party/libaom/source/libaom/third_party/fastfeat
+			third_party/libaom/source/libaom/third_party/SVT-AV1
+			third_party/libaom/source/libaom/third_party/vector
+			third_party/libaom/source/libaom/third_party/x86inc
+		)
+	fi
+	if ! use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use libcxx; then
+		keeplibs+=( third_party/re2 )
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if needs_clang && ! tc-is-clang; then
+		# Force clang since gcc is either broken or build is using libcxx.
+		if tc-is-cross-compiler; then
+			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_CC=${CBUILD}-clang
+			BUILD_CXX=${CBUILD}-clang++
+		else
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+		fi
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
+	if use lto || use pgo; then
+		myconf_gn+=" use_lld=true"
+	else
+		myconf_gn+=" use_lld=false"
+	fi
+
+	if use lto || use pgo; then
+		AR=llvm-ar
+		NM=llvm-nm
+		if tc-is-cross-compiler; then
+			BUILD_AR=llvm-ar
+			BUILD_NM=llvm-nm
+		fi
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# Create dummy pkg-config file for libsystemd, only dependency of installer
+	mkdir "${T}/libsystemd" || die
+	cat <<- EOF > "${T}/libsystemd/libsystemd.pc"
+		Name:
+		Description:
+		Version:
+	EOF
+	local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd"
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	if use system-av1; then
+		gn_system_libraries+=( dav1d libaom )
+	fi
+	# re2 library interface relies on std::string and std::vector
+	if ! use libcxx; then
+		gn_system_libraries+=( re2 )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Only enabled for clang, but gcc has endian macros too
+	myconf_gn+=" v8_use_libm_trig_functions=true"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		if use qt5; then
+			local moc_dir="$(qt5_get_bindir)"
+			if tc-is-cross-compiler; then
+				# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+				local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt)
+				cbuild_libdir=${cbuild_libdir:2}
+				moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin
+			fi
+			export PATH="${PATH}:${moc_dir}"
+		fi
+		myconf_gn+=" use_qt=$(usex qt5 true false)"
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		use wayland && myconf_gn+=" use_system_libffi=true"
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=$(usex lto true false)"
+	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
+	if use arm64 && tc-is-gcc; then
+		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
+			third_party/crc32c/src/src/crc32c_arm64.cc || die
+	fi
+
+	# skipping typecheck is only supported on amd64, bug #876157
+	if ! use amd64; then
+		myconf_gn+=" devtools_skip_typecheck=false"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	# Build mksnapshot and pax-mark it.
+	if use pax-kernel; then
+		local x
+		for x in mksnapshot v8_context_snapshot_generator; do
+			if tc-is-cross-compiler; then
+				eninja -C out/Release "host/${x}"
+				pax-mark m "out/Release/host/${x}"
+			else
+				eninja -C out/Release "${x}"
+				pax-mark m "out/Release/${x}"
+			fi
+		done
+	fi
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+		--chrome-executable "${S}/out/Release/chrome" \
+		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
+		--profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	rm -f out/Release/locales/*.pak.info || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	# Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland"
+	doins out/Release/xdg-{settings,mime}
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+}
diff --git a/www-client/chromium/chromium-112.0.5615.49.ebuild b/www-client/chromium/chromium-112.0.5615.49.ebuild
index 0c39b812a76f..2bce8de43100 100644
--- a/www-client/chromium/chromium-112.0.5615.49.ebuild
+++ b/www-client/chromium/chromium-112.0.5615.49.ebuild
@@ -18,7 +18,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg-
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
 PATCHSET_URI_PPC64="https://quickbuild.io/~raptor-engineering-public"
-PATCHSET_NAME_PPC64="chromium_111.0.5563.64-1raptor0~deb11u1.debian"
+PATCHSET_NAME_PPC64="chromium_112.0.5615.49-2raptor0~deb11u1.debian"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	ppc64? (
 		${PATCHSET_URI_PPC64}/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz
@@ -28,7 +28,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
diff --git a/www-client/chromium/files/chromium-112-gcc-mno-outline.patch b/www-client/chromium/files/chromium-112-gcc-mno-outline.patch
new file mode 100644
index 000000000000..9ebaf1720a90
--- /dev/null
+++ b/www-client/chromium/files/chromium-112-gcc-mno-outline.patch
@@ -0,0 +1,29 @@
+From 428afabde5f20bc91ad1166b983b9975188be737 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Tue, 07 Mar 2023 17:46:30 +0000
+Subject: [PATCH] GCC: do not disable outlining with -mno-outline
+
+GCC build fails in arm64 because -mno-outline is passed. This build
+option is only supported in Clang.
+
+Bug: 819294
+Change-Id: Ied5cf194c26fd284aa66477cf0cd381b8cd26607
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4316542
+Reviewed-by: Hans Wennborg <hans@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1114023}
+---
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 4e6708b..6ca2924 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -1304,7 +1304,7 @@
+     configs += [ "//build/config/nacl:compiler_codegen" ]
+   }
+ 
+-  if (current_cpu == "arm64" && !is_win) {
++  if (current_cpu == "arm64" && !is_win && is_clang) {
+     # Disable outlining everywhere on arm64 except Win. For more information see
+     # crbug.com/931297 for Android and crbug.com/1410297 for iOS.
+     # TODO(crbug.com/1411363): Enable this on Windows if possible.
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 066004ae5fa2..3a18eb5b219a 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -107,7 +107,7 @@ DIST firefox-102.10.0esr-zh-TW.xpi 614579 BLAKE2B f43efdbc63293629474fb02f5cae5c
 DIST firefox-102.10.0esr.source.tar.xz 479026088 BLAKE2B b4d8eaa6d72b009d12b435781c360f043bca7554d8b069b8d858399ece03f20703d7e36427a3f92d0b801a94b1c3f132904f21e51ba4118116bbfa4e5668d651 SHA512 f2b53c35bdd22a3de6f32699b832babcbf499667197c02dd50cf0b6cd956e0f4471f420938c2ab72f0a0686ed99fe74e3184afe9b5f7169130879b8f8fd99f0b
 DIST firefox-102esr-patches-10j.tar.xz 21744 BLAKE2B 326f206dfcd5b6ea2f06f5f537505e23d358f6d7930f7e72fd8e54af88d97172170999c246af888278143810df42be9414541e47feb48b60732565a4ee38579e SHA512 5efa50b221abedbb84c1b3d19d8ac089ac5752448e8c90c6aed9f43bf3eee876b7e7050a1678bca65f6b23734c4945b016bf059a3921ad7290b0150538111bbd
 DIST firefox-112-patches-02j.tar.xz 17296 BLAKE2B c47545a6eeec32c9a15aa0a5f9f4535e186a2b8e7c140b10f9e8665b90f9d1c74673dbbcd3e0e6e3a2232fe060f340884dbb431d755bf21537923efb4bb430e1 SHA512 d90c8cc81f5c885bce35d6872162eaefa529a37db905424eba2e223f3f02a22ecf63b503550df77d7e73b539573f2169b2f6c99e7a46623be1492467ee19782d
-DIST firefox-112-patches-03j.tar.xz 18620 BLAKE2B fa56645d97a4196ddbc2a39c3e700be46059d7c03c33957645426922cc7e83883ab7a4a75bf5e959ebeee8ac426fb88da6c149a478b8119280ff3920393bc5af SHA512 1b7106470a6d80842cc5e0006ada324c429e43298186c4971d403ca4e880d175c690352d9db2826925246f1ca4a3939859356f1564bd193ad3fd698787d164be
+DIST firefox-112-patches-04j.tar.xz 19448 BLAKE2B f93760e9c314f839d7db982b2b904cfe92de3bdd8006ba6fd783909c5fef2a7722fc60b22bdde0a9d833a956a7143b01663054d1c2a59b8c6a2151f9111c9f28 SHA512 30b27c0b1a66eb785654c624fc33ea148b587ba567b26dcb089603444b22b714052bf387c8c4e9288cc610456405b42b0c7e126bfaf37533bfbebad5f4349f28
 DIST firefox-112.0-ach.xpi 459577 BLAKE2B 3adb567d9b02f04e869236b7863d2f7425fe721f0c26bafd21aef30b0a761fc7dc0aedc7abf99429d6da19c6c33d4a7669edb1531526822e20d54d802f2bd92f SHA512 e3a0487ca57ba731bfbacf7628f497b623a68324d9464a73d18e36d3331dde434d05b73abe3d8864ce684d4bddd4d20b73ee53c397dfa9f665360dd612c7fc63
 DIST firefox-112.0-af.xpi 423010 BLAKE2B 6f87c4cc3eab518c111793860845c34b3131d50500211b0e5b813b376c8a13d5aee071a40e9172e2482994234d4d5764e14a24bb68a9ae8b4b86e8bcb6f0b97a SHA512 000fd456377692eca76efde709d8526c599a38fb9839018cee726ca6359d3356f42f8620b892a9082cd8dcbad5c6be1346c7ef9bfed0b97910f7a343dc0e2cac
 DIST firefox-112.0-an.xpi 503915 BLAKE2B 2e7e5fa8a7ade25e28edf32402a3132333019938d315483bacd3156c7c1cdeebae037d144f67a04d3dc16004012d0d855b5091249f83ebb55c84b680c903cce7 SHA512 45915bb76a712cfd437526f59bb56ce7b493bdc636f783cea1f7e4809d178189ac4622b733465147c82fece78cb49a5f81bb3ef91ee5c6f4ef55415bba55b672
@@ -309,6 +309,6 @@ DIST firefox-112.0.1-zh-TW.xpi 607189 BLAKE2B 95d3484406e81f2e82e3e6aa4530f3dfd7
 DIST firefox-112.0.1.source.tar.xz 506649248 BLAKE2B 99f38d96cd3d2bc68835ee0fdbf2e9e3ab54324409092cd11ade096d8cf678e1fd69087897a4a4d9c4a30cdb08e0e14b881ef834028dec7598ee55eaae301f80 SHA512 23a5cd9c1f165275d8ca7465bebce86018441c72292421f4ed56d7ad8ada9402dc8d22a08467d9d0ef3ef8c62338006dfa3bcbddf12cb8a59eafa0bd7d0cda50
 DIST firefox-112.0.source.tar.xz 497250760 BLAKE2B 6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a SHA512 6b2bc8c0c93f3109da27168fe7e8f734c6ab4efb4ca56ff2d5e3a52659da71173bba2104037a000623833be8338621fca482f39f836e3910fe2996e6d0a68b39
 EBUILD firefox-102.10.0.ebuild 36945 BLAKE2B 7fa69a1943348e1dddb8143d3012a185054f66cb5d5147a9e69f502c7e29267c5e4ac06b6bad86e55122fb155c176912568fac3e8ef2daaac66ce4d9988a4575 SHA512 4f475808715fde3565fe415d0e8321ae38aba1c253824b6ee8f5fb1041beb935c516fe4ef034ca3ab736db968b99024ff2ee891d8cd30b5dd588e31439a0d6c2
-EBUILD firefox-112.0.1.ebuild 40295 BLAKE2B bd9fd48a43745fd3003c12dd65448be9d17b718ffd8a56061c6179da682c855702a7220366f2a5d6b6b2498d82cc869ddbe6ca085153820f2266f896850cf005 SHA512 60032f146604ec3ec0fafc556e3607ccfdd54755c5f71b434d5bae823520e1b25a298023e01ca2b5a28b9b9fd3873ea6ac15531315f38a9c2cdca841947f83bc
+EBUILD firefox-112.0.1.ebuild 40295 BLAKE2B 37de28a9494525dcccbcdb772da358cee92296f6658cfd97d13a00377e3d31d91a2ecb62c8c8f040269bb0389266f02cfdc62517bb39f5bf0bbf278333bc9431 SHA512 3c08ec991b495f85453124a38cab332882126967c492075e76aa7c1aed3554483a22d8b9082e003f6eadaade933b330bce8e2520f4e706ee77b596f7db262ca8
 EBUILD firefox-112.0.ebuild 40323 BLAKE2B caa6d90fe78953e687a6ec6ef08ee1a4ceb77e05788064797bcc16b26386d48c5de09e7cd56b5b76946e4b4c2f60d6bc711a567c50b3908c7c062386b754a1ed SHA512 4c699107ec5e65a234dcf97eaaa4ded39a9f07382a06f2b51ac98a9a9c7dd63f8cb2fcd5be1f1f7eb22013685e87de7f3bde535722df66d1885abfbcdee24828
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-112.0.1.ebuild b/www-client/firefox/firefox-112.0.1.ebuild
index 9b54c0545337..5e54183d96e8 100644
--- a/www-client/firefox/firefox-112.0.1.ebuild
+++ b/www-client/firefox/firefox-112.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-FIREFOX_PATCHSET="firefox-112-patches-03j.tar.xz"
+FIREFOX_PATCHSET="firefox-112-patches-04j.tar.xz"
 
 LLVM_MAX_SLOT=15
 
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 710af2b34b7e..bb63ba96cac9 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 55c9522fe0be..d2a2a5c4bb17 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -2,6 +2,6 @@ DIST urlwatch-2.24.tar.gz 141175 BLAKE2B 7868ba757493c97ef65136d3da67ef3bb6b0d62
 DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c8649005e617a6a585bf3b73d30914f8c7a89c0fb9bb04cc07a8797d77be07807e8d7c64976355749417b39e40 SHA512 af14c5b4e11345e56e6f326c114629f1e074215d6cc66d9c642424b2a689dc80339157f1b2547fdbe7b7a13d520e2b83bf23c7477da4ae4e43d108e6452624ca
 DIST urlwatch-2.26.tar.gz 174305 BLAKE2B c7990b0ecca8bb18632ba717dabfed3e3cdf147ff463e1221c4f7002fcb862d162421ac927bd6a570369a1833268cc08668e284e425e954a4eea8d41cb30eafd SHA512 df214e3576dcbc8f18338a17f890e53ce9142fb98ea5042567eb415e697ee1a19d40b00404a40c0cc4aaaaa35ff3d838d9e0273a6bfe5178059560723ef6e4ca
 EBUILD urlwatch-2.24.ebuild 2436 BLAKE2B 39a408c3db13371bb4b4839ac8cd3c31f38a6b0da6d4c5d9a0e1e021eb4bf1bf610495763a7afa1c623378f35387798f5603d0954431857be2b096724ff0fbc5 SHA512 6514fe12bb3929ae65350c35ca3efe00119f91129a274e333a4876ce3a3ca3ef818658321c7bb5b0e41a940e4a785b7d055e14c9e301e707069282a7917217ea
-EBUILD urlwatch-2.25.ebuild 2486 BLAKE2B cdb7233bd1a743a52d9a8e402be707eef53ffc44ac29e0c9b5885d2b7110638b09e3ed87aa9ce7b97e1c74c2c9b48a82109f94b1a8075826f7124aceca32de75 SHA512 9528fcd2c41ba47b1b27c7371fa8bea2ba99b6723d4966a60273515d0fb7bf47ee1eb215303b72306ceb656e4d1faa5456e5b1bbc5044d1a1a0257d27d2ef29a
+EBUILD urlwatch-2.25.ebuild 2484 BLAKE2B 55945b5deecf90622a2badf6089156fe01a41b0a1ed02efe00d5c157311ba9ae0b9598fb21ae6eb233127b01104d4dc9e10f1b3d4a3152b3ad9f466214bf822b SHA512 c7d3120838f310bbc49bc4d83ba26ab18a7e299a009873b107c082c014f47bab366e67e8590a7dd2ba73cc5f5f939017acb2b44e9d85a872ffdabaf23d5f343b
 EBUILD urlwatch-2.26.ebuild 2174 BLAKE2B 753d34a8363518ad47ef0b8bd6e959185d05ebf937b7438d79528e398da8aad0b52f0bf61219bd28c54747e84d8d1540f365af98a491a1f3d49208fc291d9739 SHA512 fc5ea386a43ca7df4cac59f6347917926e06a60f0cbb97ddaf8eef231adebff06f9b425a8d1bf573e85e648149b94c11704fc06ad67a83fc2c9f5872d312ba71
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.25.ebuild b/www-misc/urlwatch/urlwatch-2.25.ebuild
index 746a7b008c8f..cbee5011eb6b 100644
--- a/www-misc/urlwatch/urlwatch-2.25.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.25.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 40ff58a07915..0cc801c90c19 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2a20ed5d97fa..84c11c60907a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -17,6 +17,7 @@ DIST modsecurity-nginx-1.0.3.tar.gz 34063 BLAKE2B 859a29eb7f67d53a818578f1008f0d
 DIST nginx-1.23.2.tar.gz 1108243 BLAKE2B 0a6a556afe93c4326247e879e3bb2ad377cd734a572f471b52c91b1b2901a243a848cd74fea587bda5afa0ee91dec9635b5d2a468cb95abc7f361c42a32c9598 SHA512 4a5413c0ec251c02fb73dfb4d351045f857a36d45ebb7ae2c29f4a4f320a6543d0a049b147b08318de0b7b0406773c329dbf43bf98bb088f76e506ea532cd8ef
 DIST nginx-1.23.3.tar.gz 1108958 BLAKE2B 5b8980f54e3f662ec6b4f8f0a50305c91081aaba881ef94f3c60e5fced8a79710ff09aae3abda3dce7dbcd460b1a46b1d3c0007d5dc76fbec5c4c2ad91ae7aa7 SHA512 da5f473ac213f8947f40f0a69820bf981157432fe9d29cf71fe30225dadd05f5814309034f0411ea15fb70bece8ceefc0cb0b2588096c1a9496c2a36fa425d9f
 DIST nginx-1.23.4.tar.gz 1112403 BLAKE2B fe9e4256cf092394a485f121d73f3561c0f1f3a72eaf7a279f23ca88d3cc92ae8498b895687dca582f681e621cc99906e86c7c08a3d2dfd73a203af67ce34d4a SHA512 542a53cae32bf5c7d4d09a4940793e603e0b3c7a8a4ca2bcec84e64bc298fcf0e58297338d1ae0cd28889c4a3e359f3f48532b0addaf7d223f796ed81c3054e8
+DIST nginx-1.24.0.tar.gz 1112471 BLAKE2B 7f671c57666dec822bff72fcf0e4eec35ecf981b8f1e489827f9bbbf9179036f61c9fdc7e497c076ccaeb35b9ba3dfe7684e4fc91ee9cae52601f68859bb034d SHA512 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-1.0.0rc.tar.gz 16207 BLAKE2B 450d0ea693bd98d4a1b615f2cdcaad41ccd28266f6d80beec7fe77fe750ab8c5d1bb55aabe15161b9b6d819d2b4d99a7774f2706f2f6fd084b52a7c7dddbc00c SHA512 05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d
@@ -24,14 +25,11 @@ DIST ngx_devel_kit-0.3.1.tar.gz 66542 BLAKE2B 8242d884464d99a131a48f599f9d0c2b54
 DIST ngx_http_auth_pam-1.5.2.tar.gz 7016 BLAKE2B 1efc8d2d12aa09a2b2a36f6f6d0132ac21fcd1720a2843ce598450198e2b7fe902e9ded15a78b66e8a897e811faa872e4e391bf211c795e320c1ccd57607c319 SHA512 b82e401533c44298c41bc9a1caaf3f7850e42da151c06a77a927f817810ebf5ce01c49ca81de42c326345765c784bb55e28fbf0f6a5500626f51e58a216b53c4
 DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
-DIST ngx_http_echo-0.62.tar.gz 53329 BLAKE2B 7d92184f7fb878cb5261be1c68de4432d472469028e20c2150925ab3d9a1c472ef557a11b84ee60d7ae6b48d08b35890c50161540668918492f2092dd0272962 SHA512 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
 DIST ngx_http_echo-0.63.tar.gz 53421 BLAKE2B 613d4f265b9bcf9b4a44a18749314075e797dca4b350e6c4bc2e7ddd52edadc52660504ee57d0c859ec0a20f6b2e425727e5ec4b30282e67498010fc8d959baa SHA512 c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
 DIST ngx_http_fancyindex-0.4.4.tar.gz 26292 BLAKE2B a1ed76cb31cd4f7a349bcbe63d75f8e00331d0ba4ee9b7b1df41dac77fe64ebe6c72a6fd5f6ebc9de53e8d3a8a2ad5185fbaa533d8ff008fcf92f6956f267d80 SHA512 bf8ebb188c10fee5e6ebcb338fe20fdf859bb88d9b2b0e3da6f3e2f1847738d30760d2642d0dfe257092bdf2399b561631556a3a8e2fb33dc9cd0c59d371c173
 DIST ngx_http_geoip2_module-3.4.tar.gz 8877 BLAKE2B cd59ebbd2ca47f6af0b22b8b91768053d2c991f7adf19941625e3570d81dcb73989101795d641e4efce1eed37d454bca73d603b5d0e4511e3bd63100c7acf750 SHA512 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
 DIST ngx_http_headers_more-0.34.tar.gz 28827 BLAKE2B 48badf603b93601b11c837057760f768ef2579062786bb366795617635747b654cecafa3a230eec1a3e442ab768fb068867ceb93385b14b6452b621764acfd3f SHA512 2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b
-DIST ngx_http_headers_more-d502e41996d24a382bd9c632e3ae3efa0a5fca66.tar.gz 28810 BLAKE2B cb71e6b8a9da6c72bc542e837391e932c5803d52cbf01eab0b70f501b620d7de03009a25d10e9ba9de46a6c9ffca109b50dea47cded687412eb55210ba6e68c8 SHA512 80193f95f9754b1d6fb784cde6b4c4d6f72b5cff406c26329a93ad87a5833cd87ef7a8113d719bbe6913fd8e1fb29f438fa81e6dada8c0fc39bf0f2e47fe08ae
 DIST ngx_http_lua-b6d167cf1a93c0c885c28db5a439f2404874cb26.tar.gz 718179 BLAKE2B ac4893892dd2836e46055d57feb492e3122ab2c3c91e56917e52cb8ccc683469ab77d26990b9ee4a4bb3bf639267cce7ded7b07463912cc5579a7a09730da8b2 SHA512 f547c4f0490a25600b4533050db3b5d2ea595ad72e0737fc0be8060eddf7b5712e3dcca59e4d29999415c9455798e232a7de53a9380cbd38f264b4ea371e86c1
-DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 DIST ngx_http_naxsi-4140b2ded624eb36f04c783c460379b9403012d0.tar.gz 166325 BLAKE2B f80353bfc1f3fc009b847de1c1c5d623a84682efc588649cbd156f669336c95f337442ebf350c79321bf59477215f083817929f13550b22dc7f393583aa16ba1 SHA512 6d6565189d9fabdcf318270107455bb4915d2a43284fb2f77b5cf025a4b4843e990c1c1dbc254e0f3879ca7d30ac7bcd7eb8637f491d5b7f05193aa9865be7cc
 DIST ngx_http_naxsi_libinjection-49904c42a6e68dc8f16c022c693e897e4010a06c.tar.gz 2123473 BLAKE2B 69208f09ca9f10f59f53a3e949894ebc6e51b0ed5708e551759fd8fbc002c83f5a0462fd22eaf52cae290992633729f47403b33c41539437e40700fb7763ac2a SHA512 ed643aaed8d70dae028ec3df48be3aa2c03955073039cd14fb6187bf162cfee9131ab3e5900ddc349526b171f4da0e01e13b39a669cb85838c1f254476a3c1b8
 DIST ngx_http_push_stream-8c02220d484d7848bc8e3a6d9b1c616987e86f66.tar.gz 196994 BLAKE2B 90baeb4fb03aeb309bcf1a987420067ca81843ff9b85b8fc26ba703741571e631826e5928a439a3ae79f2f5e369a3acb2cd803789308642ae757d67722ac7f33 SHA512 ad5424d65909d1cf0c2b64d7a4bc3123f4d3e240f1c9d611f6b6fc41167d169f474c723b1c327d42bd295f973a6365ad32e3f095b8c7c7cddc7e54aea138ca31
@@ -39,16 +37,13 @@ DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46
 DIST ngx_http_upload_progress-68b3ab3b64a0cee7f785d161401c8be357bbed12.tar.gz 17379 BLAKE2B 4790657b3f207eca460a26f5c4d1139dcd495e29fffedab8d716105e6dc3039cbeeecf5f6005d364470951e25b472860b46e3e08bc9573a5a7b4a23f53532f8a SHA512 6603e15aa33edca5e647fd04b4f008f1729c78c527be262ef481890f37a6d57e89609cebfb7459fad18b249024fbe3722e09473987401e8d8dfdd7cf50e4df4f
 DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
 DIST ngx_http_vhost_traffic_status-0.2.1.tar.gz 179679 BLAKE2B 3f0f950745695997232f4ae07487e58d798a3a4f2cd0ba8d922865a39e010e1282932469fbeee615a115358f1e9e36f67876fa507fbefb7c146d701ea68a864d SHA512 fadd4727ffc56111b443364d90e5b0597f09b25006404b11377586f0ed754f5a85e0b84796360be927bd455f43eb28e18004991f086b611146cd340937a6e5e9
-DIST ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz 380721 BLAKE2B 8a63d9663aa896869345b97e4bb2a9ac93585d6d7ee16891c98f6445b90002ab90989d195399bf90c5a8ad32c4c908794b7cc33fa45183f9069c51906abb1606 SHA512 46451b3c9b7a3c57145fc8e1de9d8ee984286acff2fc3f4e6c4a39589eb42dd686844410312701d167eb369ab5943184b4fde1ef319359e272dad6fcdb8cad25
 DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
-DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST ngx_rtmp-1.2.2.tar.gz 519934 BLAKE2B 8745816b879f506720955d6c7e5e8af036e88b3601a680071ffb255a3ec31d69e132b5cc8b493202fa985eb30b8529428f683b5154a0054c0ee990d3185c7abf SHA512 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
-DIST njs-0.7.7.tar.gz 609779 BLAKE2B 878c1a106237d42f03074051d12a2de409a1ce3088ec3fd8a43032183608b68e0a11f438668aaca3135ac2280875f248467d6fa801539fcfc6d1436db1579199 SHA512 3fd9e9b84e416e95dbdffced78eabd76a519cccec7c386d8acaccd0d891dea5ceeb702408d4450107c7e3909586753e4eeb5e38c06657cd8f273180beb8fae74
 DIST njs-0.7.8.tar.gz 613161 BLAKE2B f6b10be576119f418cdbe052a0c82b847d1b43278f4f0764ac7a9c7309162bf48fd60b40542b97e43fa925c87817b19785ffc6c83fa0611ca73256932e8481cb SHA512 086ddb2e5189a8853598870b795bfa788e9e75da9d2502541a49314e8149d7c279acca0709c4c517db26611a416dc5fb989be807cf1697c7411aded1bd5b8237
 EBUILD nginx-1.23.2-r3.ebuild 40462 BLAKE2B fa567a68adeeecd7f8fc1b1f8f2c0fc9717ecb6e7925b1a8466801adf8ad9ec9a15d222784042455c9ae0995ea3f9dcd2dc55d5bfa24957bd1883668539d9d5e SHA512 0148cc685da8ef69bd24beac14450a7bb75133cfe9ccbab77642e1278d131b00080463bf0654c33668da3c1440b6ed448f584bf541c36475a15a3991c2c71d26
-EBUILD nginx-1.23.2.ebuild 39690 BLAKE2B bc9ea5141f66d21cb003b09c37e9a23da3405323364cb3f9fab3c5f161e6b4d2a261a720a3b31e204906b98a6ba9c4da7d614a1e5732038fb6af482ae1664823 SHA512 d2df73e079653c42258661511df7c1ba4ea558cbd28f48b862d721d95726906c3e4e293f4c3f71cb97050b313eba11110091bc04191ba264c99a073ed18ad06a
 EBUILD nginx-1.23.3.ebuild 40461 BLAKE2B 7a6c11e2893e65d21149c5abf6f062aaffcea8d285f88ffbfbce5603c86d9c0ed6d2cb8f7c0304357836fcca4dd36c6b89cd772d2faf2d9a6c9d432086414961 SHA512 0d993b9d066a000382250cf81bb28b6ee5de60bc87e96e7953e4db8ed84c2d220b5c8c6ad5028db82f6ed221ce43da72fe4785eec07c3f4675659a45a9538980
 EBUILD nginx-1.23.4.ebuild 40465 BLAKE2B 8e085ffcae73c70815bbff1e8ab130f216151d26382bcbec2a47fb1164b5ff2d6ae79f1752ff47ebc6a4015db2d2bfcbb28a8a50468c333d6533e407babf2d42 SHA512 84c693c89795831eda35b9faf21ed23817754649c72e2cb217651f5f8098b8adf138bb97763db3638aecb5eff1c66ceca65ee7e7789b3267c0330d2e19582261
+EBUILD nginx-1.24.0.ebuild 40465 BLAKE2B ba7ca9b20d0a448f8f18059be2ff32090397e779a0a2e803d0b45acd27d25e9a469b28c8d19aeb9640b9d8b5c15110502aa2334e67393c222f8a20aebdb2fd0b SHA512 9c1bc760256fca5974dd5e7659292b61d18b629b407a91d052b829dd4f6a70d97a9cfa7c4cc2d0607d34fc8757bd7f75d700bdcdbd1954848a8cf17c1459f43e
 MISC metadata.xml 1012 BLAKE2B 5fe75eb9105a998668cfebf02c6976784f4ef3332edd0b6c21a23a5ffb0838b4ae8bc9e52f5157b43c3c0d060825ac46bccabc94bcf8b59447311e0f9ac94f29 SHA512 0d243d1d5271d05d51a46b5825fe32ac5283211434672e99e7314c57f5d1f1f88f48c189fffcdb12747c8d33c9dafe0c8df12376cbbec2912732da0ed6de0642
diff --git a/www-servers/nginx/nginx-1.23.2.ebuild b/www-servers/nginx/nginx-1.24.0.ebuild
similarity index 95%
rename from www-servers/nginx/nginx-1.23.2.ebuild
rename to www-servers/nginx/nginx-1.24.0.ebuild
index 283d53ed7cd3..5611fa3c44c7 100644
--- a/www-servers/nginx/nginx-1.23.2.ebuild
+++ b/www-servers/nginx/nginx-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,9 +35,9 @@ HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progr
 HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
 
 # http_headers_more (https://github.com/openresty/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="d502e41996d24a382bd9c632e3ae3efa0a5fca66"
+HTTP_HEADERS_MORE_MODULE_PV="0.34"
 HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/openresty/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
 HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
 
 # http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
@@ -84,19 +84,22 @@ HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HT
 HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
 
 # http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.2.1"
 HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
 HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
 
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
+# naxsi-core (https://github.com/wargio/naxsi, GPL-3)
+HTTP_NAXSI_MODULE_PV="4140b2ded624eb36f04c783c460379b9403012d0"
 HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_URI="https://github.com/wargio/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
 HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+HTTP_NAXSI_LIBINJECTION_MODULE_PV="49904c42a6e68dc8f16c022c693e897e4010a06c"
+HTTP_NAXSI_LIBINJECTION_MODULE_P="ngx_http_naxsi_libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV}"
+HTTP_NAXSI_LIBINJECTION_MODULE_URI="https://github.com/libinjection/libinjection/archive/${HTTP_NAXSI_LIBINJECTION_MODULE_PV}.tar.gz"
 
 # nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_PV="1.2.2"
 RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
 RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
 RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
@@ -108,7 +111,7 @@ HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v$
 HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
 
 # echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.62"
+HTTP_ECHO_MODULE_PV="0.63"
 HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
 HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
 HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
@@ -156,7 +159,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.7.7"
+NJS_MODULE_PV="0.7.8"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -185,7 +188,10 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
 	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
 	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
 	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? (
+		${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz
+		${HTTP_NAXSI_LIBINJECTION_MODULE_URI} -> ${HTTP_NAXSI_LIBINJECTION_MODULE_P}.tar.gz
+	)
 	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
 	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
 	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
@@ -201,8 +207,8 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_security? ( Apache-2.0 )
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
-SLOT="mainline"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"
@@ -312,8 +318,9 @@ CDEPEND="
 	nginx_modules_stream_geoip? ( dev-libs/geoip )
 	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
 RDEPEND="${CDEPEND}
+	app-misc/mime-types[nginx]
 	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:0"
+	!www-servers/nginx:mainline"
 DEPEND="${CDEPEND}
 	arm? ( dev-libs/libatomic_ops )
 	libatomic? ( dev-libs/libatomic_ops )"
@@ -329,7 +336,7 @@ REQUIRED_USE="pcre-jit? ( pcre )
 		pcre
 		!pcre2
 	)
-	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_naxsi? ( nginx_modules_http_rewrite pcre )
 	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
 	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
 	nginx_modules_http_security? ( pcre )
@@ -370,21 +377,28 @@ src_prepare() {
 	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
 	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
 
+	if use nginx_modules_http_auth_ldap; then
+		cd "${HTTP_LDAP_MODULE_WD}" || die
+		eapply "${FILESDIR}/${PN}-1.23.2-mod_auth_ldap-fix.patch"
+		cd "${S}" || die
+	fi
+
 	if use nginx_modules_http_sticky; then
 		cd "${HTTP_STICKY_MODULE_WD}" || die
 		eapply "${FILESDIR}"/http_sticky-nginx-1.23.0.patch
 		cd "${S}" || die
 	fi
 
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+	if use nginx_modules_http_naxsi; then
+		cd "${HTTP_NAXSI_MODULE_WD}" || die
+		rm -r libinjection || die
+		mv ../../libinjection-${HTTP_NAXSI_LIBINJECTION_MODULE_PV} libinjection || die
 		cd "${S}" || die
 	fi
 
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		cd "${NJS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_javascript_cve_2022-38890.patch
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
 		cd "${S}" || die
 	fi
 
@@ -670,7 +684,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"/etc/nginx/nginx.conf || die
+	cp "${FILESDIR}"/nginx.conf-r3 "${ED}"/etc/nginx/nginx.conf || die
 
 	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
 	newconfd "${FILESDIR}"/nginx.confd nginx
@@ -753,8 +767,11 @@ src_install() {
 	fi
 
 	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+		insinto /etc/nginx/naxsi
+		doins "${HTTP_NAXSI_MODULE_WD}"/../distros/nginx/*
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/naxsi_core.rules
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/blocking
+		doins -r "${HTTP_NAXSI_MODULE_WD}"/../naxsi_rules/whitelists
 	fi
 
 	if use rtmp; then
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 42840d16de60..6090e3fa63bf 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,13 +8,22 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.7-src.tar.gz 6075723 BLAKE2B ef00c3c43a6cd6c68b09930fd7dc8f822b49f5cec3a0c2b3dad1cb20e5f37ff17f35dfd48c5a8537dedbb9c3887620b6e0ec29272a002df46aa8fa0e5ccbaaa7 SHA512 3daeb5cb3650382224ba4b5cf830c7288531b7f565fdde4a8acca1ee66bebbbfafb4790a6ce50b965e176e9669203e90342e61d42d1656fd12f656d9394c3283
 DIST apache-tomcat-10.1.7-src.tar.gz.asc 849 BLAKE2B 79d5d6885dd3304999a3ec1e16ffeca95df0b0b135ad6733b932b745e248bfd84be06f7eb70588167e7a8b74c4fa1db93cfba99dee10b8ebc00b7ce46226e128 SHA512 ae5c9238ea33743ed40dc74e47e6441f52437322376df94b770dd00e354dc67851cedeb2b4b1148262bdb12b15f7ded49d0f5ee050d451006fa81c5c86b20768
+DIST apache-tomcat-10.1.8-src.tar.gz 6086270 BLAKE2B 080ffacfb3b010605fa901319f3f059524f532306af5a5d05a0e4eaf108be06ed139977ef39e8b9fa0423fef0ad073305b57793bcbb4e897bbb0239cee183017 SHA512 14ac35a22d24284b770182996388bdc004defc5e56e65d2420e096a1e1c5c45887e4a55c0174884294acb7c99e6412f98159bb9be92de337e1a1cacc48d39ea4
+DIST apache-tomcat-10.1.8-src.tar.gz.asc 849 BLAKE2B 2a62d64e349739397fc786b92e75a14b74d3e8f9243a4f90ca17a070d85bb31707417da01d9d34217a23ab10157dbff46857efd65629a66aa41be861fe036ca5 SHA512 e818e040be1e1c29c989228cf72586ac8a602a93373ac33760db22578fbf79a5202f038b4cf36a0ec3549112bcdd5f5629a6859119aa0b129fef923c073c3055
 DIST apache-tomcat-8.5.87-src.tar.gz 6041463 BLAKE2B 2b41e324be028b9bf4db3fcd32a45ad6a84644535c20c5a46c7850c8b0ee054130a7fa5091009928b71c8ece2f24f49530845727cc3f1b6d5907de07d7ad3703 SHA512 cd15fc27c781a0835ec5c35726832f51abfc8bba9b647e690b3dadb7141b5c96b5014f0d6ebf46277d43cf10e2839ef0229dccf87c0449f2004ae90041ef10b6
 DIST apache-tomcat-8.5.87-src.tar.gz.asc 849 BLAKE2B 05a5911b344b5ffdcb392189b64dc4c4d31d000a8b653338780e74ab569a3b024a13b491ba4946bbf68b5955af65df05bfe7b4795a120977f1b26a2bcff0c96d SHA512 fb56af00d3f9302251e65a08d852992192137eeed0eecf100bcfafb778e01dfb92fc024f47ef41ca71f01eebb3622fcaa53fcb776403939313502039080a2b4c
+DIST apache-tomcat-8.5.88-src.tar.gz 6051684 BLAKE2B bae4785765d2c373a5507bf1f422a9d4d0c0157f7b642bb2c34edeefc341af6661fc55077b03d8f5fc77744bf903792f0fdfd7265efebdafbeca35fb04a3a20f SHA512 f3db0daf451ab6ef34163e2adf6388cd4d4502c7b28915f3ae954b79ea3fe5ed17c900294bac0b192268431a62d501b3b8d35f6d9e0bcb3ae1f9962ac3b8a084
+DIST apache-tomcat-8.5.88-src.tar.gz.asc 849 BLAKE2B e82e714721272c7ca6e6837a4be369c9ef3ad6c654f56ba15028f7f8d8f54ab62d7c1da32a2f4914c417889b3b65ef9f5ba6dea7d8ed4125de871ee4f91339df SHA512 f5ad2bd77287e763d7a09b5be17601b318ed6492d5c476903eadd54304b19afbbedd90ee5232b5dbc30ee597ed3c4fe5fc371c3d9809b94ca1614fcde1bec4d1
 DIST apache-tomcat-9.0.73-src.tar.gz 6229040 BLAKE2B 97b1348e532eea75c4d0723c314cc24a9c13bd4a948a8eea4d1ee1c5121472f2fedec7d30c240b2617a51ef57898fbd96c254f9d84c9e943ebe808f1dba4cf16 SHA512 1691a0087ceaf2100ce17fe9b9a973d079c39b20effbe0c0d68f92d2684a681e001b0c2b8bde40c289754ac02ba02f9eb4dfac617fccb8f451c96dfdd4741237
 DIST apache-tomcat-9.0.73-src.tar.gz.asc 833 BLAKE2B 0d9e81e16e356aded1f02dc02833f24875584794358591b70a2fe54d67d116c7305dc5a477d158395afe3b72b2958c2dc0e102a893b8ef504a3f24acec14ba41 SHA512 fda56cb885fd6ab0bb00907084977217c2e23bbfb2fe25374bea1bd9f863f5275dd8949e3ff2a88d5d10f37788978b484ae59460c1bb43d2ca0ac814426efcac
+DIST apache-tomcat-9.0.74-src.tar.gz 6237459 BLAKE2B d4942b85f184e8ecdc8bbb85256fe70677be772fdbdce906bd097eac6a56653ee08d3b76bbe42f4ef34664229c62ad236557ef8742c9e9bfa8c728927027d3b8 SHA512 a57afcc669d4058b4a46e9c7e196443dd5a09aab2b194d2a1f258fd218e09cec73b5f864ec073d9090a0e633b67f7deae7d643207511dab349d6a578449706ff
+DIST apache-tomcat-9.0.74-src.tar.gz.asc 833 BLAKE2B c5f2cc71272b5917cd522f4b3bb480fd39b62b47abfc4ab688c878a8561d3a19b6eeb0390d16512739f0b4b8ae0b275c3c72a3b853ffc82bcf737a61bea644f4 SHA512 ea0795309f240fb771d27f0914b7b7d22fdefd8d4502207d3ed422f91eb51853dc6712eb480505554a13dc04a40657523a4536e9f2a8d60d4ae9a4d8440ea502
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
 EBUILD tomcat-10.1.7.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
+EBUILD tomcat-10.1.8.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
 EBUILD tomcat-8.5.87.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
+EBUILD tomcat-8.5.88.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.73.ebuild 5665 BLAKE2B 7a5d46aa3919e1a0f021d96ff6de326f7f0d17f7eeb31ff1863e15f5b56919cd4383c36c3b72c9e8409ae3f2998f92204d0279da27c1935c797e25aac269ec3b SHA512 041d17c1a05ecb482b64c2cedd744901615519d8e7cc25fea74d643cd850d5bc4ea138ecdc3232c9db9e2cb76ec09562593860a284ec56cb24b97df3ac2753d3
+EBUILD tomcat-9.0.74.ebuild 5649 BLAKE2B c7bc422d705e483556207f7676b7ac172e98dca481c1dbc27c3abec0d7162d26df3ab3daad7a1ab3b696aeddfdce6f3f4b80b6e87affc16e5c82748ce13fb89e SHA512 de832d9cf3484e4912e0afc6898d7a19c0451adf5fb3c981651ec0c5b4a4f658759f62583e5af57d6cc3d41bcd57e71ba066a7749989b9144fc09c789d3b6c30
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.8.ebuild b/www-servers/tomcat/tomcat-10.1.8.ebuild
new file mode 100644
index 000000000000..a2d0614c3733
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.8.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.88.ebuild b/www-servers/tomcat/tomcat-8.5.88.ebuild
new file mode 100644
index 000000000000..6f5f1a7f9687
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.88.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.74.ebuild b/www-servers/tomcat/tomcat-9.0.74.ebuild
new file mode 100644
index 000000000000..adb21d22de91
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.74.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.4.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2fe40a85cbbf..37514891c4b1 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index e021bd591e87..e174c80e8b9e 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -20,5 +20,5 @@ DIST wxWidgets-3.2.2.1.tar.bz2 27339515 BLAKE2B e761e768dbb32bf76dbabf27aa9feb63
 EBUILD wxGTK-3.0.4-r5.ebuild 3752 BLAKE2B 57acf7f620095191b662e806496ddc5ed38fed912edb57d352b292be0ca65aa86ac547b06049a35ef2359cca0e6990887d133bbb1f7a1f75aa1be08b30bb3bef SHA512 cd84b28e0456e899ddf9bf84607fa9f411ca81efe064d2f7b015102186abaf175c150f26c7b61e109809f86b080d49f386927a01f41b53d0b8d05e18135561a9
 EBUILD wxGTK-3.0.5.1-r1.ebuild 5495 BLAKE2B f3daf6569a27e61c3cb60eef9a29aea35305e48523ef6572639905e81757f12e5a41b9e93fecbfdcdb5bf55a29db7d47515d0e2c9c40630bc4b611fa4cc17665 SHA512 2718f47aed0f875407117f85b28f7ba385e2def712fe7be4256d94211ef0d56f7e5eee0f72cc94644500f93c6b5e75ea01c16009ea7065cf112b3d102c6c6a7b
 EBUILD wxGTK-3.2.1.ebuild 6886 BLAKE2B 00c0384db71bc25f73a390ab4c27c104b3b560e0bd149cf54cf2384830df82c02227afb556518e973c3eaf14a639119c5a0e6a87dd71d57d40edcb345da83223 SHA512 d234b1c37b35976fc7db54ec7f6663b1a7b22b9453ac2d0514033dd4093dd975593489912315f1244a7e94791e35a6604e211802e04f9152ec7f713f5edf89ad
-EBUILD wxGTK-3.2.2.1-r1.ebuild 7034 BLAKE2B 0c53f9767a12f69210d6dd8c54dce806bf6659f3926e63eacb63983d19292fc40522cbaef42bf645136784ee74de327797be565ddf3a1e68a6c6628aff40f978 SHA512 54878ea86ba9737255d072c4622b66a7f3cc0285854e5a5df6e1faa2bc3c0cf16c15df285dfb4253a6fa1d3f9b729ffd3d554828a387a0fe61bdc0ada7371771
+EBUILD wxGTK-3.2.2.1-r1.ebuild 7031 BLAKE2B abd2c06647e3f0be43d57e0f908f7c1037f46757ba4d526e4b347ac0e909f37ccad2e4a37bd0ff93edbad1a116525b7748dd36eb5ace49676a16ec9ade278b56 SHA512 491bee24fcd52cb8a47c229e9db3a424495e6f26ee1ae1ea95ab9c757be8bc4c7433e1e5eb3dd1adbfc157a4663cfb6a13c20ebb0fd23b5ecacec1867b8a17df
 MISC metadata.xml 756 BLAKE2B 336ffb3375ee9092de02d0808d0a44f7f5bcbc6e4a845c12b6466af0b91f3397c2b335e5433917361a060db43d6cb836cde0f87be2059214f314fa6726199e2d SHA512 190b72992c64b43b46e28ca2f730e1897a5f740ba211b859c816b4892256284feb579fbce06cb1939b774ae989dc68754f5a57f6375cfca50d7770d0c2ed47ed
diff --git a/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild
index 7a0988e01d87..dd5084965916 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.2.1-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/wxWidgets-${PV}"
 
 LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
 SLOT="${WXRELEASE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+X curl doc debug gnome-keyring gstreamer libnotify +lzma opengl pch sdl +spell test tiff wayland webkit"
 REQUIRED_USE="test? ( tiff ) tiff? ( X ) spell? ( X ) gnome-keyring? ( X )"
 RESTRICT="!test? ( test )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index bb75d0432879..0c3cbc62ea58 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index b211ab759487..25ccfb703049 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,4 @@
-DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1
 DIST dunst-1.9.1.tar.gz 4614410 BLAKE2B f2d3b5ca28ac74461e31c09f7c5f8369dd6d05e8133d184625344b5445fac8e673cf5c57d44ea8bf0f3d320167663529ea49e8de0ed873afae327cb7db55d5ff SHA512 6045529196c2d8bd89d2976db9712bf15ec75923fdab414870e1ae2af2eb87afc2b5886cb707a19ea113ec746f90fde1e52631eec9b7a96f1af03acbe6445f32
-EBUILD dunst-1.9.0.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
-EBUILD dunst-1.9.1.ebuild 1717 BLAKE2B 062fee96e7e193c518e87422ef1eeec553bd921397fc9a6964af44cf3d3bf04922e3ecbe58f1ba6e714b7cc26d915e5d2f3fc81f8d7eec2581001ec15d92b271 SHA512 aa7a021aa47afccedbda04d92e7a95719fc9456f9d720ef7e0ae202f66a8648315aa9f5a7dadb57bd675ed9f2e0edfa298d5d550fac37acd101ed2a95cba1bfa
+EBUILD dunst-1.9.1.ebuild 1715 BLAKE2B 3b9208e105c31b2f70ce48198fbfe707291ccd29d89c049a91e9331fb0351186a4a59755f77dbe0d2b8b70063032fca7f2434855743a6f421875715d28fe5f46 SHA512 bf0fba1d98d126ea3fc287d6fbe702bbf9e20db1122fd7d40d86ecb0a0f04a558621d678995e90f199ea7b2864afdce4341ca2f937c5e856fe1574f74f953051
 EBUILD dunst-9999.ebuild 1565 BLAKE2B 600eb84737690daa8ed7557251e6214331d031a1cf99ebbfa821c135d9064f47cfd2a47afb04feeb8dbb5512f7c062ab19358a76539cd22be35649a0c035b6ef SHA512 a89b6f5f134fd5564b936fdd514033e8a187a5ff2b833802b353f0c14f7596216408b3eb454a90d525ae1313e6ee3295394480ad781ea833d05d04c1aa7f8804
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.0.ebuild
deleted file mode 100644
index 37336b25c793..000000000000
--- a/x11-misc/dunst/dunst-1.9.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-	x11-misc/xdg-utils
-	wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-	wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os//' -i config.mk || die
-
-	# Use correct path for dbus and system unit
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-
-	default
-}
-
-src_compile() {
-	local myemakeargs=(
-		SYSCONFDIR="${EPREFIX}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc/xdg"
-		SYSTEMD="0"
-		WAYLAND="$(usex wayland 1 0)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.9.1.ebuild b/x11-misc/dunst/dunst-1.9.1.ebuild
index 2414b563605b..f054ef05620c 100644
--- a/x11-misc/dunst/dunst-1.9.1.ebuild
+++ b/x11-misc/dunst/dunst-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index f38207132e3c..8cae928a1309 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -2,7 +2,7 @@ DIST picom-10.1.tar.gz 286934 BLAKE2B 0a6637c5615cfed514b746d85c2627b398fb0dd45b
 DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d
 DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
 EBUILD picom-10.1.ebuild 1584 BLAKE2B c935837a5b8a48cf0d50259cccf13e58c2e88dcfaa519d95006d5f9338b7cdb3ee09d8949d4a7e5c377039a57b0768af363673c4da0badbcbc711f6426914ff0 SHA512 e16ed8d563c1553932162f082b9798d21ccf5a9e87dc5acdaa60db2e68bde34dbcf39d971b17be70c6e3892ceafc0d7715f3023dd949e3873535ceda518f793d
-EBUILD picom-10.2.ebuild 1584 BLAKE2B c935837a5b8a48cf0d50259cccf13e58c2e88dcfaa519d95006d5f9338b7cdb3ee09d8949d4a7e5c377039a57b0768af363673c4da0badbcbc711f6426914ff0 SHA512 e16ed8d563c1553932162f082b9798d21ccf5a9e87dc5acdaa60db2e68bde34dbcf39d971b17be70c6e3892ceafc0d7715f3023dd949e3873535ceda518f793d
+EBUILD picom-10.2.ebuild 1582 BLAKE2B be05958637eef0268c6285a02955204a8975727136f2085f02a78ba6b026abed970d931ad985f3a6d33ca4cefdf1e05b7594c697a26eb4098f4f36d35ba33504 SHA512 3492a5faa2f19323b592e957a3a36ad751d38e38a0317344c11b38dea8769262712281de36230b44f6a6ebf294becae564e56af896cc16a4ebe76ceb5b9e5729
 EBUILD picom-9.1.ebuild 1582 BLAKE2B e30f0022d572e362c774c99dfdcb81ebe1e6d97b8c75b75f8eca16ee3524e0fdbde09ab3841884f74a6ac21c3b1b02aec249a592e17b974f5d2b44fc13b6aed8 SHA512 7b611d52c9a65041c0f437ae800d41b487408953faedbfb22d33754e2dee1539ee7a69e0835cd20b260b93f9361adacfe0c478ccf5ef5cf9847cdce4138ec029
 EBUILD picom-9999.ebuild 1523 BLAKE2B 9c24a1efe6d0b4ba27297f5cac1f9708d1a7e6fe716e9b3ded8d71d02a58e334a8e97070d7c2aa2cf3a06983098dc51159f64a875218cdd3ef22f1f463c004d0 SHA512 df1128e7ef11ce640b959bb1ab9d2a8e2aa80a93ff4f631396b7cbaf9fdc09b4cffb4d0d03fd1e7fff7f86618f8eb8625729210d4e913df5681ea4bf91ac3cbc
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-10.2.ebuild b/x11-misc/picom/picom-10.2.ebuild
index 096c4965a203..5500bc0c290b 100644
--- a/x11-misc/picom/picom-10.2.ebuild
+++ b/x11-misc/picom/picom-10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index b4a3298d42db..c27350200984 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.49.tar.gz 421009 BLAKE2B 3de92cc61203a176793f5279db4c9f871718a5dd8eaf6e3c534b7c4367109398fa6e3cf2aaf17c5179ebc65bd964d9d907d6d9e26827ec845ebddd9e663e46a4 SHA512 d6617bc85bb312e2d8eb506c84488a8a3b290f14523d1efd066b68dcccda612919f5d724e7c9e7c71bd87fed91f5156ad9c9f8b73bcf44287a1db42a679e54bc
-EBUILD py3status-3.49.ebuild 823 BLAKE2B 35a86088e42b13c76b9e62abc5202ed40611de0e1c14aa3fae9333975a2deff85efb907431101135da64718edeea6941a8b1eea339ba37ad3565f4c4757dfee0 SHA512 c179eb78052286e1f99461a66efa0a849d50bcdc2f5e8794cd0f0fe42170e66aa42948a51dc130d1a5da61d85fcf1fe56840fcddd5d94d4fb4865cb76f2c5ebc
+DIST py3status-3.50.tar.gz 421152 BLAKE2B a53f6e67b98da7ebfd82797662c5fffdc44d119b48ee124ad858f0f2b1195bb6b9a1d3d1d0f38c66175886fb937410096a9146051acd755ddb996836d73bf9d4 SHA512 4b542f8724898836dfb5023a8a9230e2b6e5de3dba3d8115ac653251626706ea16d066dc2221a9b2688538425e12cd171e7db0bbe5178c642e97bb4170520c5d
+EBUILD py3status-3.50.ebuild 823 BLAKE2B 35a86088e42b13c76b9e62abc5202ed40611de0e1c14aa3fae9333975a2deff85efb907431101135da64718edeea6941a8b1eea339ba37ad3565f4c4757dfee0 SHA512 c179eb78052286e1f99461a66efa0a849d50bcdc2f5e8794cd0f0fe42170e66aa42948a51dc130d1a5da61d85fcf1fe56840fcddd5d94d4fb4865cb76f2c5ebc
 MISC metadata.xml 649 BLAKE2B a3ea307c4d4c613773015caa89c6aab50af43fe2b7fb8ef0ba673cbace9fefa015236819f85e416639e9683c554c06f3c0141bb1b933001b69b5c2d55fd0a0d0 SHA512 fee8d759154f61a9228038eb1ed990d55a2cc70c43afebb213b6d81f7b98ea333dc89775a64c6600adefae8bdc82a76df26dc0c26ad1bbdeac6020c0f065e67e
diff --git a/x11-misc/py3status/py3status-3.49.ebuild b/x11-misc/py3status/py3status-3.50.ebuild
similarity index 100%
rename from x11-misc/py3status/py3status-3.49.ebuild
rename to x11-misc/py3status/py3status-3.50.ebuild
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index eac46dd2d655..b324b0009594 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,7 +2,6 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-AUX virtualgl-3.0.1-libX11-1.8.patch 4857 BLAKE2B b37e84af828c4d7e37a9ec424aa92dc25330be9362f0c7bdc2624eac0898d5995be1647c690b2b7be9e656747785325aed961ea11ef5f653ea05ab44b4b3e4d7 SHA512 f17715b21f91439675981d2e6dad635cccbb36ddc012f037ff9d0859a21179f6881aac1ad7f5630e2311146bec7b10284bad982986b1e2f43beb3b24a0a8796b
 DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
 DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b
 EBUILD virtualgl-3.0.2.ebuild 2862 BLAKE2B 6f72164ed90b1092c1571477f09ccbecf7bbcbe389ec8ed246fd285d7f8796bd0bf1486a834044c14d0d014f02dc53ddf099acf50a0db2d84068ec92f2070837 SHA512 d2cbe9ba3fe6107966cbe855d5536a0ad70ffbbb646d4bf9b5ca86a14c81b3ff296cf9bd72d8ce5de3704edceef68b31593b0987fbb81aa3e51c5c3650c34c9d
diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
deleted file mode 100644
index dd37d6c3b664..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Thu, 7 Jul 2022 17:22:57 -0500
-Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
-
-Fixes #205
----
- ChangeLog.md           |  2 ++
- server/CMakeLists.txt  | 10 ++++++++++
- server/FakePbuffer.cpp |  2 +-
- server/faker-sym.h     |  6 ++++++
- server/faker-x11.cpp   |  7 ++++++-
- server/faker.cpp       |  4 ++--
- 6 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 292a5a94..4b9cc36f 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary drivers.  In some
- cases, this led to incorrect device permissions for **/dev/nvidia*** after the
- display manager was restarted.
- 
-+2. Fixed compilation errors when building with libX11 1.8.x.
-+
- 
- 3.0.1
- =====
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 574521a0..2ce92856 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -91,6 +91,16 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- 		> ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- 	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
- 
-+include(CheckPrototypeDefinition)
-+set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
-+check_prototype_definition(XkbOpenDisplay
-+	"Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, int *)"
-+	NULL X11/XKBlib.h LIBX11_18)
-+unset(CMAKE_REQUIRED_INCLUDES)
-+if(LIBX11_18)
-+	add_definitions(-DLIBX11_18)
-+endif()
-+
- set(FAKER_SOURCES
- 	backend.cpp
- 	ContextHash.cpp
-diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
-index bfa55279..64aab775 100644
---- a/server/FakePbuffer.cpp
-+++ b/server/FakePbuffer.cpp
-@@ -10,11 +10,11 @@
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- // wxWindows Library License for more details.
- 
-+#include <X11/Xlibint.h>
- #include "FakePbuffer.h"
- #include "TempContextEGL.h"
- #include "BufferState.h"
- #include "ContextHashEGL.h"
--#include <X11/Xlibint.h>
- 
- using namespace util;
- using namespace backend;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index 0fa1e5cd..3c6f94e8 100644
---- a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, XNextEvent)
- 
- FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
- 
-+#ifdef LIBX11_18
-+FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
-+	int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
-+	int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
-+#else
- FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
- 	int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
- 	int *, reason_rtrn, XkbOpenDisplay)
-+#endif
- 
- FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
- 	int *, major_opcode, int *, first_event, int *, first_error,
-diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
-index 99e8bf17..a233f3b1 100644
---- a/server/faker-x11.cpp
-+++ b/server/faker-x11.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
-+// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
- // within libX11, VirtualGL cannot intercept it on some platforms.  Thus we
- // need to interpose XkbOpenDisplay().
- 
-+#ifdef LIBX11_18
-+Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
-+	int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#else
- Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
- 	int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#endif
- {
- 	Display *dpy = NULL;
- 
-diff --git a/server/faker.cpp b/server/faker.cpp
-index ec537a62..601cfa3e 100644
---- a/server/faker.cpp
-+++ b/server/faker.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2019-2022 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -14,6 +14,7 @@
- 
- #include <unistd.h>
- #include "Mutex.h"
-+#include <X11/Xlibint.h>
- #include "ContextHash.h"
- #ifdef EGLBACKEND
- #include "ContextHashEGL.h"
-@@ -27,7 +28,6 @@
- #include "fakerconfig.h"
- #include "threadlocal.h"
- #include <dlfcn.h>
--#include <X11/Xlibint.h>
- #include "faker.h"
- 
- 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 534ce141c16d..4ab64c6f4b74 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,5 +2,5 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
 DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
 EBUILD zim-0.74.3.ebuild 1827 BLAKE2B 44c738e81590a89088d535a374d58945a9ba7c2d2cdb8184e013e80707466124e2098d838b995af950dd63d18361e4a2d99ead2d3a70a378c10f53aa2ae66aa5 SHA512 aad716cb741690be4a1c5455b9ec1edaab3bdef8c28dbde24136b95eda1aa6a00d01ea71a85a684995f2246b99b19dd32aa67b66d8c906611a10bac72fb18760
-EBUILD zim-0.75.1.ebuild 2035 BLAKE2B ac7cc28255a874b4bdec08274407da28df4695f16588bc82b245661586cb92313e1c0bade0a15957cfbc8f5d47fec3e56930b8fb0b60e37f4b0df96b23685521 SHA512 12fa574153f40f7d1c5cb488577c71482a75d03a4942912846259c3f409cd2c1fdfd2c8fb836e0495ed87e730cfcb6208d7255c6fe92c47bef9e2a970934aeed
+EBUILD zim-0.75.1.ebuild 2034 BLAKE2B 37e08133c6618703445e594a6b7477640654143fa78b7c6177a46a179a8287663601146084bb3a5edf53d1615a6703e60fe46a64cdcd025fbc17290bcf2163bc SHA512 769825e0602bddd55d86a69f084fd15639e113c00b13d197e1bc90459ea55889f52723a45018572fce66fa8cc7c40b0e12e45042c3d591a0f55df90bb158fb29
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.75.1.ebuild b/x11-misc/zim/zim-0.75.1.ebuild
index c5d76bac3fa8..c670751098c1 100644
--- a/x11-misc/zim/zim-0.75.1.ebuild
+++ b/x11-misc/zim/zim-0.75.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 76c5ffdca400..f167e80e3551 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/pidgin-indicator/Manifest b/x11-plugins/pidgin-indicator/Manifest
index a75599e44fdf..3c278fc5489a 100644
--- a/x11-plugins/pidgin-indicator/Manifest
+++ b/x11-plugins/pidgin-indicator/Manifest
@@ -2,5 +2,4 @@ AUX pidgin-indicator-1.0.1-appindicator3.patch 686 BLAKE2B 0202142d16dc73b6ceef3
 AUX pidgin-indicator-1.0.1-ayatana-indicator.patch 2066 BLAKE2B 73d59bfdae09f9c95b9c72f5bdcf1537cb4cf12438ed886f11efc55ffbdb3577b5bdbd00211edb3385c880b337a617be60c46268a560611298a7275d1ada6b42 SHA512 1b6a403630b5d91a2620e7927aefa422291769cb9924a6c7770aad8885057ce6babeb78706793b205bcf544b288ba38bd340207aa0fe01ec446b628eeb76780b
 DIST pidgin-indicator-1.0.1.tar.bz2 311197 BLAKE2B 53c29c5c549f77caabbbbea69c447c2c092e063ee8d1a082507ec195ef7be45bf150e7831ff27c7759c79fc31ce289cd374fb7734f5171a9853e5fd37ac05bd3 SHA512 a39a285309242cfd121cff6aa6466cc2d6b4e37787cce87b9b7ed00a4147fee8ce2e9c6817212680c81b20b9c0bf7dac5d501861e6feffd8d0479a8293ad8201
 EBUILD pidgin-indicator-1.0.1-r2.ebuild 912 BLAKE2B d6cb99a9273cf20539ccdb8b02c8cf8464ed39cb89d0602ad6c2218ecd1f6cdfb09f591002f6f76176385a2c5235efeb664933814c092dafe7bec0a845675754 SHA512 59051cc339d81e28b457bd75ed33719e0870e57d71ceea9cf5eef6df730a38d002c09370b3d85eef24b95c4084a03141292a3368880367928851b8d171ffb3de
-EBUILD pidgin-indicator-1.0.1.ebuild 878 BLAKE2B c61d545b751fe2502b7710fa65ab617cf490f212270b595df8584fb0afa3699abb60fbfd7ccd4fd78b381bdc5abe4002fd3c86d49244085897f1bbab1de4e43a SHA512 48304be615ce4f216d927149360f456ebb508dc8b86ad6128b1d196d5cd79f48b0bd5e6630518f835f3ea4a39c7713860a3c30a7d556acf125131f258724b83a
 MISC metadata.xml 326 BLAKE2B 4e224ae375dc6710c52496cb0fcff6056851eb542e34283b51a33522587e38a582b3ca3d4250b182047954e0add6acd92ac02c316994a2e38d6abca12eaa9293 SHA512 cbceb28d799cd33feef00eac6a78e13beeb79b475c24a8e8a1001be8e923371b4ae785f3cdf0e2c7db335f4fdfbc9d08f913b8417004b072e6490d58a60c5392
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
deleted file mode 100644
index 1a903c3269d2..000000000000
--- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg
-
-DESCRIPTION="AppIndicator/KStatusNotifierItem plugin for Pidgin"
-HOMEPAGE="https://github.com/philipl/pidgin-indicator"
-SRC_URI="https://github.com/philipl/pidgin-indicator/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE=""
-
-# No direct gtk3 until pidgin migrates:
-# https://github.com/philipl/pidgin-indicator/issues/32
-RDEPEND="
-	dev-libs/libappindicator:3
-	net-im/pidgin[gtk]
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-appindicator3.patch"
-)
-
-src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 2d82adf22deb..372544dcb4fd 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 1d3d9e41db32..06cae2c515d4 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,6 +1,4 @@
 AUX QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch 769 BLAKE2B a5d15dd96986cae69a1f1431dbc7b81c82064ed0ff9688a528a2d0facfcc9008c4a4b66cfae0eb1cf6155da0be4d59c5f2cec7f14e3cdf250a17cde8af4d1280 SHA512 4bc3bbcd79809d0cb14afc5fa3a931f6fba12987e2e03559f034080a86828129cac65ea85c7710c745fac4e944848cfb0483ad572234345d79bb806d20ffaa47
-DIST QGnomePlatform-0.8.4.tar.gz 38602 BLAKE2B 19f33ca6fbf43fd5bbd53fec38187802bf0c0d48c4018cff9ae7252e3cca8c8abe27b0aaee54728ad4c232c97efda2163c5a1c1347b1d446f8fa955a0e7709c6 SHA512 e5bb5feae401bca145c4b7a4fc18f5a589e2acba20b9ce7d04a7dd1b1734741daf210ff8fba5e03ef5e4ad07efd274a1279e61b359f319b52e3b9bc4d49f9142
 DIST QGnomePlatform-0.9.0.tar.gz 43828 BLAKE2B aa4d1d9269c444d95e7d25e0e0206a63adf0a1be8658624b61d5e5fe55d3714e38a66ecbb6ea19ebf0cc9ee1ed4fb5cf4f29a84e7052c1c2475deca395794cd3 SHA512 7671b0659959ede79e47a821481a14ed861418f364d3d0b48789b1edfcf3b84f2aa658e3afce95730a841fdb018ebad38474a83268bd43b1ccfb653ef7e314aa
-EBUILD QGnomePlatform-0.8.4-r1.ebuild 878 BLAKE2B 40fd27736c94b84144a30d8e3f3e20789c63adb6a32922f5e8acca241515dec3b69d786bb02f8e2944313e42a5a78088b67b50dae60376c4aea48f8df6a0f49e SHA512 519080a937bf6287ca33bd3fa20acb496620f52d8706f6ccbfa380973f1659bb9c36b57863444757f6e14a04559daa00a8d63e375c30e7ce86a6fc31093f4d34
-EBUILD QGnomePlatform-0.9.0.ebuild 840 BLAKE2B 604e4460699f2f4f45eaee5967c7f0af6a4e0a42fd3c5e14faf6471434b1afdcdd979d653da19de3e7e47f5e9b6227c4a2d2a86c95e5a9676538dc852968ed63 SHA512 c3aad2375a3514c044a25e0f5743fe283c9a9bd710caae404c69998a535e5629bbf27f2c9cc45b5a1c9579563666aaf394de181e2e31b0c0abd59312003ee90a
-MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
+EBUILD QGnomePlatform-0.9.0-r1.ebuild 814 BLAKE2B 3f39fb15f71f9d94719884e25f0028c2b1fde9beb64c5e4c06c5f8e751a7a4e146be20a33adc19ebac4cade61e1381dbe919ca60366e3c767a59ea91bb439055 SHA512 9c6dfbc8d0a1bf8d9087f77c2437160c1946e0708540eff808acc433f6c4081124826e8a0b94bb7d60dd4598c8c210aa42e17e66193bb13231f0078c12870b28
+MISC metadata.xml 305 BLAKE2B f67fe263c76d1afef25f949b60da91bece890f786e1123e3481addad7b90e56bb7371c56d44d7e619eac9bbedebce1ae934d3319903b403aed7d9c29eb915131 SHA512 cfd7d208224234fb616d260b4cbdf04bda0161a0c36746aea12c3ceca16230543429195b93465c5b44c7aac95f89da4e9175c70f70112cde27eeac0af040b267
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
deleted file mode 100644
index 636644307115..000000000000
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
-HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
-SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5=
-	>=dev-qt/qtwidgets-5.15.2:5=
-	dev-qt/qtwayland:5=
-	dev-qt/qtx11extras:5=
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/xdg-desktop-portal
-	x11-libs/gtk+:3[X]
-	>=x11-themes/adwaita-qt-1.4.1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	# https://github.com/FedoraQt/QGnomePlatform/issues/101
-	"${FILESDIR}/${P}-xdg-desktop-portal-id.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT6=false
-	)
-	cmake_src_configure
-}
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.9.0.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.0-r1.ebuild
similarity index 90%
rename from x11-themes/QGnomePlatform/QGnomePlatform-0.9.0.ebuild
rename to x11-themes/QGnomePlatform/QGnomePlatform-0.9.0-r1.ebuild
index 63e42a91afda..303dba543346 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.9.0.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,10 +17,9 @@ RDEPEND="
 	dev-qt/qtdbus:5=
 	>=dev-qt/qtwidgets-5.15.2:5=
 	wayland? ( dev-qt/qtwayland:5= )
-	dev-qt/qtx11extras:5=
 	gnome-base/gsettings-desktop-schemas
 	sys-apps/xdg-desktop-portal
-	x11-libs/gtk+:3[X]
+	x11-libs/gtk+:3
 	>=x11-themes/adwaita-qt-1.4.2
 "
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/QGnomePlatform/metadata.xml b/x11-themes/QGnomePlatform/metadata.xml
index 572c7daf2ccf..fed4f0aeb413 100644
--- a/x11-themes/QGnomePlatform/metadata.xml
+++ b/x11-themes/QGnomePlatform/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">FedoraQt/QGnomePlatform</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index a584267f9f2f..ba46458c6d6f 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,3 @@
-DIST adwaita-qt-1.4.1.tar.gz 1543217 BLAKE2B 8e85ad8361856ad937c865603b4caf0e1c40b81b2cbe4a572f7e5a04d18877efdf1b8b8317f0c811f5e3ed270ba62481dd207ad9b67170930131f6e8d9b8b389 SHA512 efdc64addbd2ee4b4eb133323540a2c662cb882e42aa0573dace9044acc7638658badac3581d6cae7a3f17905692e4e8f768b6a8e3c1b4575d7e1999c1e9fe63
 DIST adwaita-qt-1.4.2.tar.gz 1543173 BLAKE2B 5b089092c5d809e4dab5cd30b86e289e9b151f165ab613eb092da1607f9058b465cc42addfb0722ac0f6a5d944f6881b9f94b8e31f3a1ed9be779bea8cec2461 SHA512 ef2245cd1b08f2d5c23a534427c7a301cbb3a8b573a1870db48dfc82961417097465e02c696c311e5dd6f9fe1c03a27879c6b08aba5532d2f41ab9d0dcbd7f15
-EBUILD adwaita-qt-1.4.1.ebuild 671 BLAKE2B 012d511ee7fe49e5f7879d61535d5b5a92b965a29a2fcaf84cf01b3c7a3fbeaefb048fdbfa501dde92a19b3df9e70b6460b7032ab7728858db8c5454156a7fae SHA512 d6c8b851cb841789697007420a338f66f90354336c9dc614c1f47a4b760ff36e6f77a471150193db18f060f0f4a8196b7d24adfb9ac0e2a23428bd9358b70d6a
 EBUILD adwaita-qt-1.4.2.ebuild 671 BLAKE2B 012d511ee7fe49e5f7879d61535d5b5a92b965a29a2fcaf84cf01b3c7a3fbeaefb048fdbfa501dde92a19b3df9e70b6460b7032ab7728858db8c5454156a7fae SHA512 d6c8b851cb841789697007420a338f66f90354336c9dc614c1f47a4b760ff36e6f77a471150193db18f060f0f4a8196b7d24adfb9ac0e2a23428bd9358b70d6a
-MISC metadata.xml 217 BLAKE2B f8189b02494f180dac078dcd5c275d3c795f20f360f8b172c66065a2d937e396b24b8631bba4cd8567d60285ce89fc77b9539f2233bf33899c820613c48c33ba SHA512 f0c9e5b3d281fecd21b1e23a6f44c94c1c0b3220de46a177d35932111b7f1ab4399061c42833ac1ee9bd0324b139fc8db66e0d2890224d607bd3be38ae469be9
+MISC metadata.xml 301 BLAKE2B 7aff167d2d643a12e33735ba6260a448e64efb49ff440b2a848514c2bc8a22eec6430fff918ee1cdd7277c69e083bd8f9cddfc657b7bfd642d81211f869ab4ee SHA512 96ec5ce8be5e80fd974f2e79a98d06f412d127ea52f62d9dbf4b53c45991e6adaac6306fba76f1be80f60b359bb9c0194300d83c81e4d60319977e0d9dbc4703
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.4.1.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.4.1.ebuild
deleted file mode 100644
index b02503632d0a..000000000000
--- a/x11-themes/adwaita-qt/adwaita-qt-1.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
-HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
-SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="gnome"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-"
-RDEPEND="${DEPEND}"
-PDEPEND="gnome? ( x11-themes/QGnomePlatform )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT6=false
-	)
-	cmake_src_configure
-}
diff --git a/x11-themes/adwaita-qt/metadata.xml b/x11-themes/adwaita-qt/metadata.xml
index 572c7daf2ccf..843235f0a72e 100644
--- a/x11-themes/adwaita-qt/metadata.xml
+++ b/x11-themes/adwaita-qt/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">FedoraQt/adwaita-qt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 5adf89493e70..b21d8954d9ab 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST papirus-icon-theme-20230104.tar.gz 33527798 BLAKE2B 9aa80a3611f0a39aa0fabeb0a20a7d901ed983c046208784bbd268151a7668adf99d0e4d9df9efe544864278dc2ff417a40ab581610f11d204a4288e68173adb SHA512 c07adc6258e9c0b37b250efae91825004b5b440304b9a901dbccec90fe683eee6871f5bf3205e79ee1bf44fe13ce5f014cbfc99b1bb6488e82bd6b0b8b730bfa
 DIST papirus-icon-theme-20230301.tar.gz 33609598 BLAKE2B 7c4910d9992696ebba1e13e965fa39fb339aede971f39bdf1947f1ceaf3744ca30aa3ac348e9735e9e7004872fb6ad34747709968da84d9c13c1ad87bfba97b4 SHA512 bdb0bb4c16b33459c19665953294b34776d2ac712ee6f1e8673396f18673b68a10c90d3b2406febb5d4fad76296eb4f60f0db60a85bf6ee6f15700ee025d9cec
 EBUILD papirus-icon-theme-20230104.ebuild 798 BLAKE2B e1039fbe68fdf2192226cd63bf19a97f8a6b6af6449cdacd4122198a8a4f4812622850277a14af52d6172c658d345dac51834b5aff46eba7abfd1902b1ebee09 SHA512 17ff6e5fb8cedd9ec5e2c16f0a12f9e17048b27a31cf31a3174bf3e048ba5da36b65fe4fe3e06572d73dc0423e0d64fcf530e47f5bc483da04db0e2c022cba50
-EBUILD papirus-icon-theme-20230301.ebuild 618 BLAKE2B adab40d7c20bf9858a0726d70262bf629f0a180ac9ec27f3027f0c1955df53ea725dac9ecd674ffcf250e0c3532a45f9b6de323d137c325fa389a0de8f92cf6d SHA512 5aa607d671112d3147d8b2442b0ff8b14b6cbb166778ecbdc3cb320c40298c5b280c64fe69f6d1b8749f519fd0d72e7c87488148591900ed59287f63f18c3d6b
+EBUILD papirus-icon-theme-20230301.ebuild 614 BLAKE2B af08e8fabaa9b3b80b080871070004cbe7111c8d88590a66ddc01388ea138cb78b05bebd3a8223f6a97d57ead5c8ffc56c4ce464f63af2d9f80122140c23659e SHA512 36204f7778dd3df90f78b94a6d54e5c81f09be013310f079e2705c7fec684524389501f5af0439fe05f914cfeb5cf42b417fb37b96cab5e572327d6fffc4bd7c
 MISC metadata.xml 436 BLAKE2B f884e84b63ce044c156c635e6bdc6e7b970e7ece131ec561df7f24280302ee8b13a84c4363649040358de88459371c490ce187b50e6fcda07328315e1bcd865a SHA512 64a963b39e82b2df247b72db0c57a6451b5b0f7c3063101848d4838b78ccf86065725606b78ca3d3143efb35bffab4d9cf9609274f46314c66a65541d53ff8fe
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
index 0279bb437c4d..b65a2f18e21b 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20230301.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 src_compile() { :; }
 
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index a44f414d1843..73970b006c7c 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 61bc18b69001..040ef45e18fb 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,5 +1,7 @@
 DIST garcon-4.18.0.tar.bz2 550674 BLAKE2B 93bc218c4455c61109ee7086a8cb822aaa154aaebd082c10ae9fd551019bce0fe68a117552c05fbe3a97c671036b5306703ba3c320d9b886715a83fb038c95b0 SHA512 c4b49ba47ac33823199a68ef9bdcba3acfcedde62a96a8a8b3af2bb1f28b3a5fe3e960ee93bdb964fbc01b039047d77f58fbe5b1f9fbd2ccd3d3f968e416a55c
 DIST garcon-4.18.1.tar.bz2 554562 BLAKE2B 395cc8f7c7029196f25ecb52d393989ab0df0d9ddd34ec1fc4b0a2ee46b1a059a87c75797adb84d7557523e8e0c464278344fe3d793f05941a90874bdc8e036d SHA512 8e6d091beaf1aaa85cc16cd5e562191e0e6858a47444a23d95066f9afa3f8a70f7a61bc9fec33fe401945637e810441cbd6f961f41b40e2d2ce7a1ce4fce78a0
+DIST garcon-4.19.0.tar.bz2 648551 BLAKE2B 0084bf8b72fe1e3e2ac492c4639f84eb330ba37660adf0d5c3c41a4d9e6db3b063e4875f20dbe0a62b0c72bbb06072cb6cd37df057f6e5feb6431f35f87ea045 SHA512 c49304bc69528475318d934a4c565ade7171022f3887c7292e573ccd846137db1e7e325213a73b5a8003869adc35fa73cf5682ec646b2114f4614ae1c076ee9a
 EBUILD garcon-4.18.0.ebuild 1228 BLAKE2B 02bfa8dbe013024d4db5347ba7b7fee2d152315da16998814b992cad860b42c3ba690c6a1f1447515c200cb9207afa7ae56f6650cf616edc774d232f255dba0a SHA512 853e1960b3dfe645d5df7b35ce709975f87996a20eb22a24712fcfcfefad4e2905395d6439498a04559cffc17993b973f2e00ceb9148258707b9b2a10cc5948c
 EBUILD garcon-4.18.1.ebuild 1234 BLAKE2B 8848741b6f2562c6ea24987802bcc3003413c83d5e534944c2edec503c0cd220d98b0a7b8fcb2293514c68f7f2bdf6ee2337f5072b01a702e78fd2b2fb5a11b5 SHA512 0b14f2f533fafe7bd79609c361b89f737de882541215267070fc8ac42a6598bab7c05c236a181ddc9276f6a7176a35a9dacab3e05ef9f255dae81f7c4e2ea323
+EBUILD garcon-4.19.0.ebuild 1224 BLAKE2B d13d0f97538ffe39f9acb1be056d0f59b89c16ac6c151ddeb1f1b49e9653495a4f30cc5a251cef5c5f8c709190dd19085e526891390b1ca726574e60fbfb7534 SHA512 116f6034c41e457678f68c0dd86ffd268bc83f7bfbc5dfe7f4f7f57cf41c205cb658602a089b415c7206114087ecc5ce74a4451ca251c9692b515e646f8a7e88
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-base/garcon/garcon-4.19.0.ebuild b/xfce-base/garcon/garcon-4.19.0.ebuild
new file mode 100644
index 000000000000..8464f7b5d0f4
--- /dev/null
+++ b/xfce-base/garcon/garcon-4.19.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/garcon/start
+	https://gitlab.xfce.org/xfce/garcon/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.66:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	introspection? ( >=dev-libs/gobject-introspection-1.66 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-appfinder/Manifest b/xfce-base/xfce4-appfinder/Manifest
index 1734273903c9..f0eca7c9135e 100644
--- a/xfce-base/xfce4-appfinder/Manifest
+++ b/xfce-base/xfce4-appfinder/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-appfinder-4.18.0.tar.bz2 562219 BLAKE2B 05aeedcfe6b00509f7c87affbd9ee12d72ad2298168497fa957a0ec189f18348606ff29c177f4c3c5b3e9b7c937d67727828b97b786038ebfd03259f473fae0d SHA512 e33144910bb4391beb6ca88e312c592593ce50a40e10487c5b72eca492dd2f7c3ab7324ce62413ad6f3df0025de29ece96b5d0a566eecbc87bd1d0e62c9156ad
+DIST xfce4-appfinder-4.19.0.tar.bz2 577596 BLAKE2B d6d8bc4f3cbbd1c8e31b4f2a9964833e35eca18de26c5e6fb4cc8b8fdfafe832018e1b7113fdef0bd0f88b04a4cdc2cfc70ab84089fda990b6e0c7fd658f832c SHA512 4796eac89c15b7349c390adcb151908d6cbfa89363daea3638066f5d8108abe5f8140b6a070f9fa8689f876fe62645a43be0f1fc46ec40c036dbf1550b7bfb79
 EBUILD xfce4-appfinder-4.18.0.ebuild 915 BLAKE2B f7d50d29ceab8c3f2a35a26a9ffc60d04f45d6cf2bf9eb8bf3a4a63b95403a592a4394bfaea075e6174dcde4e40d418086cecdbd79145fb4d88b2a9254e6dbe5 SHA512 bbb0c806edac85c8525aee9d0f7bc12c33b8bff76d2555144b24f587a38103952be0656f443fde6af176475e3eaa498fe5fb8823031cd737cf0068a47f479f17
+EBUILD xfce4-appfinder-4.19.0.ebuild 928 BLAKE2B 18942f3eda0172d6703f9120efa75553f399879103ed4b59a6ff48a51dbe4632ae4d93a0b6e1be378c5ef237ce058d96bd085321c195763f9e9e01433ac6ea02 SHA512 13dd8a82ed36fd679d0afda6bcb68135c5af71009bd99930815cf4a868f826711dff3e195222a35fe6618459e4dc9dcc0d9c4e4ece6f7ba8a544df56d1dcf7ec
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
new file mode 100644
index 000000000000..f7376d553e51
--- /dev/null
+++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.19.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A tool to find and launch installed applications for the Xfce desktop"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-appfinder/start
+	https://gitlab.xfce.org/xfce/xfce4-appfinder/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=xfce-base/garcon-4.18.0:=
+	>=xfce-base/libxfce4util-4.18.0:=
+	>=xfce-base/libxfce4ui-4.18.0:=[gtk3(+)]
+	>=xfce-base/xfconf-4.18.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-power-manager/Manifest b/xfce-base/xfce4-power-manager/Manifest
index 251e4bdea118..93737b3680ab 100644
--- a/xfce-base/xfce4-power-manager/Manifest
+++ b/xfce-base/xfce4-power-manager/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-power-manager-4.18.1.tar.bz2 1217727 BLAKE2B bbd2a70cdb4fbac6146a28895b17896a10aff4a8d5e32ab82852e034977e9d1872d78eca6f8181ff16c74fcdd65ef27d891682bb93ef7ea4d846ccfee07ab034 SHA512 bb84f5a35058fa4aaa8cbe871acd898afb86885172c74d4b811d5b2c1204c0f7865c8488064622c364350c47d9aaecd07f1b65b56f72a547325e6e73bc2eb4ff
+DIST xfce4-power-manager-4.19.0.tar.bz2 1449836 BLAKE2B 0aaba64f689ea263bddf01fedfda1919d36152420acf9e068ae23c138a8ce0a7bbaf64423144ac4a5fb5313a7cf3da38093157f5a88abca2d2dcdc0d6a91840b SHA512 56803b41867080df34d6e460e8bfcdf0f16c05fa447ad34ceab7831c41efc38d82c692bb06cf94725c4b4d63ac0721be8c0a999712fba112e352c9f05e46bfa3
 EBUILD xfce4-power-manager-4.18.1.ebuild 1616 BLAKE2B a300c82827b7aa4b7a1e9e0187c9b41a31e18c13dcd551964d7c14f3317356baad8ea0e7e379f198e61fbb912a0d9a0dc3ff481c76df240fdf0a4d2c4bac965f SHA512 cf09f2cf76eab1b55cb6ed24b20afb5b58dce76ee847462b3a921516107322429fb43aef9bc0de8d315ef041c8bd5c2c3339a466c3514b9b26ea215399078686
+EBUILD xfce4-power-manager-4.19.0.ebuild 1644 BLAKE2B 3cd4e38cbdfa99afe040d127b103dfeff31c6b0371f8b10c76a1998b1bf032206130c791a30d776c3f52dea175f7484b19d403b995311118a19ea929c34d0570 SHA512 257d4ae8dee9c117dc62f1d1d03d2ac25ae13482b602b1acb06c9042de9a03e0ff895a9c9d7ec2edff50ff71cc0f5ea153d215c0af26ccdd924223ba2d280f60
 MISC metadata.xml 361 BLAKE2B 0cd2ec9e6643d7379a8c37fc9ae3b3902396c94732182f4a3c7d50bef85e555c9d69b6c8ed13d127167c44e687d356b171f46d071acfa4c26b623835df9d94f6 SHA512 ca556c6a8e5df8b0e897fe64e04fdf23b23518b86db0e29568131d2d17329122f2aa012b2b2a7fb5811bd17a230c1d5a6065ce747532b4eb868cab4eb9d9dcd7
diff --git a/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.0.ebuild b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.0.ebuild
new file mode 100644
index 000000000000..99f5a2676b54
--- /dev/null
+++ b/xfce-base/xfce4-power-manager/xfce4-power-manager-4.19.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-power-manager/start
+	https://gitlab.xfce.org/xfce/xfce4-power-manager/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="networkmanager +panel-plugin policykit"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=sys-power/upower-0.99.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/libX11-1.6.7
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	x11-libs/libXtst
+	>=xfce-base/xfconf-4.12:=
+	>=xfce-base/libxfce4ui-4.18.2:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= )
+	policykit? ( >=sys-auth/polkit-0.112 )
+"
+RDEPEND="
+	${DEPEND}
+	networkmanager? ( net-misc/networkmanager )
+"
+DEPEND+="
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		$(use_enable networkmanager network-manager)
+		$(use_enable panel-plugin xfce4panel)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if ! has_version sys-apps/systemd && ! has_version sys-auth/elogind
+	then
+		elog "Suspend/hibernate support requires a logind provider installed"
+		elog "(sys-apps/systemd or sys-auth/elogind)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 3c4675d5b926..6b093bdc1f86 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -2,6 +2,8 @@ DIST xfce4-session-4.18.1-mem1.patch 6533 BLAKE2B 2ba8b073e4ac8d38b452f65c6b7b48
 DIST xfce4-session-4.18.1-mem2.patch 2363 BLAKE2B 509f69e9f440aec41c4ef9366af5152469862b0e6ff3e20588f0ffec9a360bf22ff16cfb202ccbb9cff62db1a0c568a35e0e8cdaae7913d2af12b3a243818bb1 SHA512 0b8f693ceebd0c6f292ee244fc97e8e2a1a7c1008b651ac078336a2356d4c604546bb9a1220981fd00076aabbf16e9aeb73789d0b6f1306d2f104c421f99b82b
 DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
 DIST xfce4-session-4.18.2.tar.bz2 874616 BLAKE2B 2d5f34774bc369b6931951f4ddfa75fbad81428c5d4a10312fa17d21ef110ff2ba7ac2d10d3d6e2f23f8f6fce7cefd2c313716460ef245569101066969fcafc0 SHA512 1f8ed6a2474761197f67cf12ad5dac47c0122cb384fe9d8c2ada45bd8d94ca61b9c3c1d5c088972c676b0f2edb20f66444ab3b2a0021063160daa4eaab6a2e17
+DIST xfce4-session-4.19.0.tar.bz2 1125115 BLAKE2B 1b6736e2c5f05c1f290d319c912d91fb5804c92b3f96ad0f1eef56a88000200af4bf34257c5fcc62480068b401ff37da2454c73607c8f4b7726bbc9e3c1a5bae SHA512 2adc044a0666110ba0534179fe16b471c3691253bf4efcde3a513c93e96e78c45f7b66b690a4fd787d0e085831f15063ab84daaf6487a73b387add0de9df57d8
 EBUILD xfce4-session-4.18.1-r1.ebuild 1829 BLAKE2B 254edaa91fa8b9d0115442ff5fb65e816f644369ef2405cfb09663de85910bbdfcb0044e62b9192e7fe05b963e15e981d485bacfb8c1093b1847233e9f346e1a SHA512 fe07d88f0f1b72a3ce03ef301aad22b20026a2821fe531c64f74a7c918f734c0180dae5b480ffce4ffed4dd794ffed300e3db378a721e120eb24dd9f2f732616
 EBUILD xfce4-session-4.18.2.ebuild 1517 BLAKE2B ce0c77fcb148fc8c6768356840ccf61543aea92f4d8de746c983562255abbdb901ec3ac72d5737f4c0e9e938a338f5327c8c71840cfbabd4efd4e6ec463d1625 SHA512 9dea443db1c4f04845fbb527c3895e40e9a1f20c7128c752ed4f78672c40437062496d5e55031ca205ae983d196b3e7d24948bfaa9acf31d8d619bbbc1a42be4
+EBUILD xfce4-session-4.19.0.ebuild 1526 BLAKE2B 8952d4083712bb1306136e0296291e7b6af26b8e159bbe0a2c68667e8c9d9c7723278e6bf53cffd612edfb1644bb6db1ca61a2ed016783b4a57bf296a36fee00 SHA512 6dad8b482a74ac4806fd81a30026d4cb53e27d2501e03e7801a6898f0a70d0849e76e3afff18100decab57e8cabed88847e2d033e694f00a7c0ec5e9af0fb80e
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-base/xfce4-session/xfce4-session-4.19.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.19.0.ebuild
new file mode 100644
index 000000000000..fffa8e5a2306
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.19.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-session/start
+	https://gitlab.xfce.org/xfce/xfce4-session
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls policykit +xscreensaver"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gtk+-3.24.0:3
+	x11-libs/libSM
+	>=x11-libs/libwnck-3.10.0:3
+	>=x11-libs/libX11-1.6.7
+	>=xfce-base/libxfce4util-4.17.2:=
+	>=xfce-base/libxfce4ui-4.18.2:=
+	>=xfce-base/xfconf-4.12.0:=
+	policykit? ( >=sys-auth/polkit-0.102 )
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/iceauth
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	xscreensaver? (
+		|| (
+			xfce-extra/xfce4-screensaver
+			>=x11-misc/xscreensaver-5.26
+			x11-misc/light-locker
+		)
+	)
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+		ICEAUTH="${EPREFIX}"/usr/bin/iceauth
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	exeinto /etc/X11/Sessions
+	newexe - Xfce4 <<-EOF
+		startxfce4
+	EOF
+	dosym Xfce4 /etc/X11/Sessions/Xfce
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 856a76cf205a..f176201a7fdb 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-settings-4.18.2.tar.bz2 1544572 BLAKE2B 8dee6855c98426aace796c7c6fe55770ca2c4c8e0c5129fd70274a0fe6589dd797eb078d79f7fd490c39cd4e1ec1dd90439c4cc030e7594aeb27c84e6e541fa2 SHA512 3371db3952f1863763b613952585873a0b8e1bd8507a64c056a918f3d16c3313e1266cb65dc341d3ce89ab281ee5a5d2cd183b6bb4078609b843524a125769b4
+DIST xfce4-settings-4.19.0.tar.bz2 2370986 BLAKE2B 64a25238afffb99fefe488d2218652ce714af7f783620ed5dc9d848911293bec25f95d81089cc9bb971f73e55a861c4953ebb9affd501eeb10f27a49dfc1b01b SHA512 8892d19f723bfacea1c7df8afa5abc7d45984f8b1070b24316cb8ca04ef621489632314ce1e361eda94e036df7a36b4a7988a7853469bbad1bde9e6bef9113d6
 EBUILD xfce4-settings-4.18.2.ebuild 1814 BLAKE2B b7a30fea90f89d256f8511926102bd1cb91ca17a9d79fe061ec0314b41cc8e99adbb93eb0e8f67e90bf03de954fcb19471983e1dfc95d45a3e7b16607519ec93 SHA512 785ba75fc52c310aca81a1dfcbf6abb87867b8e4643ce6976b75bfd41f3d36b51bea77d64a0d30ad567c2ade075efba5e6ab12736c00b8d9e1adcebb02529ce7
+EBUILD xfce4-settings-4.19.0.ebuild 1941 BLAKE2B c015ae0ad32cab617d851b2c3c3f2973d89b41e7546b6357a09522abe426e142a3277247c6ddc1e7d253a7d2065cdcb76d000ce8e1bafaa4404f6eb368552355 SHA512 b6ac8586d9af0e71dca1466c977a391535092df1291ad3ac709a1a13155a1cd5766ebd4a0419f3398ffb6e48aa386835ec267b10091101bc84fbd790e297edd5
 MISC metadata.xml 480 BLAKE2B 4aabe2bbd7da19f62794843c890648503139a81904d84f6b97f9af9634a43ad583eede1adec9704969663455d033838db3a9a825c90d6f341cea411ed89514f2 SHA512 7e1e28f50387533611b4cee185e5e91b1dcc180ebb5bf7bcbd5fa58bc8ef666ce1bba57961de19016ceaa75a6b60b70ec55cff9a2d22bdf0d4f2b9e04abf2bb7
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.19.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.19.0.ebuild
new file mode 100644
index 000000000000..77db93b93f0f
--- /dev/null
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.19.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Configuration system for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/xfce/xfce4-settings/start
+	https://gitlab.xfce.org/xfce/xfce4-settings/
+"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.66.0
+	>=media-libs/fontconfig-2.6.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=x11-libs/libX11-1.6.7
+	>=x11-libs/libXcursor-1.1.0
+	>=x11-libs/libXi-1.2.0
+	>=x11-libs/libXrandr-1.2.0
+	>=xfce-base/garcon-0.1.10:=
+	>=xfce-base/exo-0.11.0:=
+	>=xfce-base/libxfce4ui-4.17.0:=
+	>=xfce-base/libxfce4util-4.17.2:=
+	>=xfce-base/xfconf-4.13.0:=
+	colord? ( >=x11-misc/colord-1.0.2:= )
+	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
+	input_devices_libinput? ( >=x11-drivers/xf86-input-libinput-0.6.0 )
+	libnotify? ( >=x11-libs/libnotify-0.1.3 )
+	upower? ( >=sys-power/upower-0.9.8 )
+	xklavier? ( >=x11-libs/libxklavier-5.0 )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+# libxml2 for xmllint
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable upower upower-glib)
+		$(use_enable input_devices_libinput xorg-libinput)
+		$(use_enable libnotify)
+		$(use_enable colord)
+		$(use_enable xklavier libxklavier)
+		$(use_enable libcanberra sound-settings)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 6b56eb1687dd..d98dd98c2c4a 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-battery-plugin/Manifest b/xfce-extra/xfce4-battery-plugin/Manifest
index fb3863b6b394..40845d068cf5 100644
--- a/xfce-extra/xfce4-battery-plugin/Manifest
+++ b/xfce-extra/xfce4-battery-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-battery-plugin-1.1.4.tar.bz2 458485 BLAKE2B 5af18d0f8944afdc6c93852220cd87020d7ea18ce27e224def5ed71f3d9490e2e30982bbff322a76feb3d6464888a8cd64e40c9938484256432537ea1a150009 SHA512 6a59630800a79d2c62434c1c50f5d891ae9ebae48037ea0859d6edd66c856a76e6f11c6e8866ca3c94ae1e5b57bdba4e9fadd4bc92c7fcef278cd2f7b82203f2
+DIST xfce4-battery-plugin-1.1.5.tar.bz2 465191 BLAKE2B 6aa8f1d3cd3dbf3fe29fede154ad51c7cf521c04191699582678e930c2ff0a20c2f50bda22d9576b1f29b595767c5ee1ce4a7ef60cdf3fd69271796d2af8ae2e SHA512 e6e09a4839911dda50fe1fed100d5fd46f6da47e5042529c2cbffa5498babc838bed56178baa23d2162b70cd6e5f005276d4b9f1fc44a1891737c94c2bf525d0
 EBUILD xfce4-battery-plugin-1.1.4.ebuild 947 BLAKE2B 9597ec94647ad333f7fa3ac115be76fe23774371985c604bce0d0c1557e1f2943d33447c25644ef0e7b645ddac8c836839a77dc115ce1f9ac77cc9fa6eecf85c SHA512 4ad657d1ed698f4d85270990fa48649257d4cbc395ff9ac80e750bb51dbc3ba6e2fba0f15ac78192e777373126060ade7dbcec58b0109ebda328ce34786beac8
+EBUILD xfce4-battery-plugin-1.1.5.ebuild 1024 BLAKE2B 65c5bcf9f3f8e60528eca06b4f704e732d159f994782b3adaff97bc8ce3b0346a8a946e66d5f1703ad4ecabd635c8c2fbc48cbf725747efe535c1b926a85dea3 SHA512 c8198bfdc1734bf2a0b7e700ccafb90be1dd994f19160e8e5d0b1928c68be6b65d8b3647c034a56882e80b824dbb8f65cc28ff28b537cc89d0a663de0819cedc
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
new file mode 100644
index 000000000000..36a3ac9eb607
--- /dev/null
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info xdg-utils
+
+DESCRIPTION="A battery monitor panel plugin for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=xfce-base/libxfce4ui-4.14.0:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.14.0:=
+	>=xfce-base/xfce4-panel-4.14.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="~ACPI_BATTERY"
+		linux-info_pkg_setup
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-calculator-plugin/Manifest b/xfce-extra/xfce4-calculator-plugin/Manifest
index 965a58945da0..518958ec19aa 100644
--- a/xfce-extra/xfce4-calculator-plugin/Manifest
+++ b/xfce-extra/xfce4-calculator-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-calculator-plugin-0.7.1.tar.bz2 402401 BLAKE2B feadd3401f5e7b3bd1bc9277e04d63329fa0d35583c6af959fa350c6622012b4089fd1143dd8f7e987cde8a6b313fba75cfba751e2afb6bcba43d9787d17784b SHA512 05544e5f0e293fe44ae35b3e11a2e6fac8df13743649d0702c01c6a4b2df0557f8f9712acef6bd51aaa65f5542234a6a649017bf2fe2a6d2860ae2e534e7cff2
+DIST xfce4-calculator-plugin-0.7.2.tar.bz2 422611 BLAKE2B 72bc2e8414b4f638299d42d8e3cd808949c966e40e96823ef5d47ba66e915429a66c7ab45acdda1a930383bc7cae63c2323e05ee8f9a5748c7f0e6d8f58b63e0 SHA512 98fa51ff0afbb09e3066f629113f6a584c5afd9228c87ee67afd7a56b065060ece16ee646ec6a2c685907a0d9733cba19cbf25bc034e009a013af2122155cc2c
 EBUILD xfce4-calculator-plugin-0.7.1.ebuild 785 BLAKE2B 8c47dbf9344935cb2823299b22c534390ca74f5de2ed4d22fb93a03ef55136d60f26f8d8402af56d8f3fb18ebfca65868d3bad13ab1d972ddc50a6a674213ad8 SHA512 07501a338dbd6019302fd41ef3dc6a4e23ba35fe8a463bbc792508b7a828ca50ee35b193ff7da5ae826af20d2693359493fc362c8a379ee2d71239ba7e8f26a1
+EBUILD xfce4-calculator-plugin-0.7.2.ebuild 894 BLAKE2B 4b302a2ad3df5c5fdbdf4ab896cb6dd421056dcad728850cf16416a8789f604fe875ebed75cf0d9a1bb67e9d449589b6011e2feb602782561659d922d74fc9f0 SHA512 f6ed29e0929888acb2dbe4f3ffd0bc4506d5d659a04fa02a1b5d00abdd6090d0247a14f00dd551225a93822eb38be6bf672ea3219c844a1bc3665b6ee51bd3d7
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild b/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
new file mode 100644
index 000000000000..14de8bbbdf6a
--- /dev/null
+++ b/xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A calculator plugin for the Xfce4 panel"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-calculator-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-calculator-plugin/
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	x11-libs/libX11
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/libxfce4util-4.12.0:=
+	>=xfce-base/xfce4-panel-4.12.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-fsguard-plugin/Manifest b/xfce-extra/xfce4-fsguard-plugin/Manifest
index f63c8f205387..c021b453feb7 100644
--- a/xfce-extra/xfce4-fsguard-plugin/Manifest
+++ b/xfce-extra/xfce4-fsguard-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-fsguard-plugin-1.1.2.tar.bz2 402703 BLAKE2B d7d4b936510d7cdc153d47c54178aebfb9f3339f6413a1013a18301806e05cf76ff2439e7b1e00637407c113149f9e72632e66e01f287e817d93ba5af208947a SHA512 ff42f3d92292357f432a69fc401dec474b1eadabbcd7602f4453f7567faaa623d3672664c3a2baa98ea4e522c6a607b5a40327c5fea33b2d8535f15a4d511ebb
+DIST xfce4-fsguard-plugin-1.1.3.tar.bz2 409310 BLAKE2B 6ad78241e49a667a7a9a2ab98daf74badd564b2aa20235f93abe80c9d30daf9b463392b2fbe044758e08975200f727eb78c9111b87c472c7bec9208f466f0c1b SHA512 4115a86a6ba38f8283752bb45527dac03b66ba3fb9d708391d9d98d9ecc97169ecbdfc515a01ad2ee2915144037e07ea1f9c8e9b831d47deba6e7c86d0f8563b
 EBUILD xfce4-fsguard-plugin-1.1.2.ebuild 837 BLAKE2B 3365606792973baa209f117d6219b2b579e715b618774a2e8c18bb9887a70d585d1da4c70d0b1158bb97defde236300c1fec2adf5e4230b50e06d4ce304fab85 SHA512 65c6f6e90d060dac0013e9b291de0e55c98bc317898551c8b6cc25d2ee92f9ef9ca1a5a8a69299e67dff65e2230526d42b6a023840f61adf668c579e6cd6c16e
+EBUILD xfce4-fsguard-plugin-1.1.3.ebuild 946 BLAKE2B f41da8b9a57c4a0f11b40528b1f8fd2eef2c2a4c3589d208850f010fd90db9044c30e6bb70dc645d8bba504efc209f498ff061c607008ec426338d2c17b4cf8b SHA512 4b9ea0039ad441cce037e416baae1fa881556d1f9cb52cd3e85ac9faa745a8d2184f1ad6bbf2033fd69e0453a2359862470c8418ca79df4244ade2cbff03ccc9
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild
new file mode 100644
index 000000000000..826f77ab8c7a
--- /dev/null
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A filesystem guard plug-in for the Xfce panel"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfce4-panel-4.12:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-timer-plugin/Manifest b/xfce-extra/xfce4-timer-plugin/Manifest
index 30106d46eb24..1aafd7039ae1 100644
--- a/xfce-extra/xfce4-timer-plugin/Manifest
+++ b/xfce-extra/xfce4-timer-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-timer-plugin-1.7.1.tar.bz2 405053 BLAKE2B 1efb88f9b4e7d1ace747950f97c1d0beaf7e9194bab639c4f8eb650378cd216f621fe30e7fbb874e73acffd1c3b30048754f07ed8fb64e96260fb831f3ff62be SHA512 4887dc2c524a8b749a20449dd491dc8f12f8babb26c64cecf33ae56b45d2446128cb65c25f11d534278ad39a2adf7ab718714e1bfa613fd39713e44642030c16
+DIST xfce4-timer-plugin-1.7.2.tar.bz2 414526 BLAKE2B 419544e8088b518cd597c6394dafe798cffcfaeefcfe4fbd11f75e9709ad7990e44b5cddca438bb4960502fab8bc6127e3e37d2899e892a1f4ff980e97a48f5a SHA512 11a3b146c56f1526530b7f810c76ba95ef4dc7c113fa0ad2839494a5bc66c09f4a3ff966bc5d76055482a284c6c082b08a4b6af4684e5ccdec67946b0cdd820d
 EBUILD xfce4-timer-plugin-1.7.1.ebuild 847 BLAKE2B fac1a5cd86e556a8b92e715f45a407d42676157da7be2ac4d3cf006aec1ca8abea2f346fa2f04276b9534680afd959eba13f0e27d328fc476130d82a6c028bfc SHA512 8783afeb88c5340e26774c2fea3b70c6cb96a4257d2a61514ebf0c7d49b25f6f7413fa1e04007ef4c4f8db433ff780dddc6d9305347529ab1dda05a012c83bd4
+EBUILD xfce4-timer-plugin-1.7.2.ebuild 931 BLAKE2B cf148170722bdb1ceab092c5054d217823edf36ea0ee0eac47ace165131ef72c11d8731630be99080ef39130f73248310f3835a8b19fbe0b6e792a4b64b3b7f9 SHA512 3181b0a809b55442ec0bedbc5f8facbae1c400db55f714a1170505745a4e46a8a094640913837282db55de6ee499cac67b44e951aec09235f81029bd186d091d
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.2.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.2.ebuild
new file mode 100644
index 000000000000..daab347695f0
--- /dev/null
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="A simple timer plug-in for the Xfce desktop environment"
+HOMEPAGE="
+	https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start
+	https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/
+"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.26.0
+	>=x11-libs/gtk+-3.20.0:3
+	>=xfce-base/libxfce4ui-4.12.0:=
+	>=xfce-base/libxfce4util-4.12.0:=
+	>=xfce-base/xfce4-panel-4.10.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}